Skip to content

Commit b923ee8

Browse files
authored
Merge pull request #1185 from jakob-keller/dev-requirements
Streamline dev dependency management
2 parents 1aa309d + feb16ab commit b923ee8

5 files changed

Lines changed: 30 additions & 28 deletions

File tree

.github/workflows/ci-cd.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ jobs:
5454
- 3.11
5555
- 3.12
5656
- 3.13
57-
include:
58-
- aiohttp-version: ==3.9.2
59-
- aiohttp-version: <4.0.0
60-
python-version: 3.11
6157
fail-fast: false
6258
timeout-minutes: 5
6359

@@ -66,19 +62,17 @@ jobs:
6662
uses: actions/checkout@v4
6763
with:
6864
submodules: true
69-
- name: Setup Python ${{ matrix.pyver }}
65+
- name: Setup Python ${{ matrix.python-version }}
7066
uses: actions/setup-python@v5
7167
with:
7268
python-version: ${{ matrix.python-version }}
7369
allow-prereleases: true
7470
- name: Lock and sync dependencies
75-
env:
76-
AIOHTTP_VERSION: ${{ matrix.aiohttp-version }}
7771
run: |
78-
python -V -V
79-
python -m pip install -U pip codecov pip-tools
80-
time pip-compile requirements-dev.in
81-
time pip-sync requirements-dev.txt
72+
python -m pip install -U pip pip-tools
73+
pip-compile --all-extras pyproject.toml requirements-dev.in
74+
pip-sync
75+
pip install -e ".[awscli,boto3]"
8276
- name: Run pre-commit hooks
8377
run: |
8478
make pre-commit

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# generated by users and intentionally not pushed to the repo
2-
requirements-dev.txt
2+
requirements.txt
33

44
# Byte-compiled / optimized / DLL files
55
__pycache__/

CONTRIBUTING.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ For example, using ``virtualenvwrapper`` commands could look like::
2323
After that, please install libraries required for development::
2424

2525
$ pip install pip-tools
26-
$ pip-compile requirements-dev.in
27-
$ pip-sync requirements-dev.txt
26+
$ pip-compile --all-extras pyproject.toml requirements-dev.in
27+
$ pip-sync
28+
$ pip install -e ".[awscli,boto3]"
2829

2930
Congratulations, you are ready to run the test suite::
3031

README.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,9 @@ secret accessible via environment variables:
182182
::
183183

184184
$ pip install pip-tools
185-
$ pip-compile requirements-dev.in
186-
$ pip-sync requirements-dev.txt
185+
$ pip-compile --all-extras pyproject.toml
186+
$ pip-sync
187+
$ pip install -e ".[awscli,boto3]"
187188
$ export AWS_ACCESS_KEY_ID=xxx
188189
$ export AWS_SECRET_ACCESS_KEY=xxx
189190
$ export AWS_DEFAULT_REGION=xxx # e.g. us-west-2

requirements-dev.in

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
1-
codecov~=2.1.13
1+
### relevant botocore dev dependencies (from https://github.com/boto/botocore/blob/develop/requirements-dev.txt)
2+
3+
# wheel==0.43.0
4+
# behave==1.2.5
5+
# jsonschema==4.21.1
26
coverage==7.2.7
3-
docker~=7.1
4-
moto[server,s3,sqs,awslambda,dynamodb,cloudformation,sns,batch,ec2,rds]~=4.2.9
5-
pre-commit~=3.5.0
7+
# setuptools==71.1.0;python_version>="3.12"
8+
# packaging==24.1;python_version>="3.12" # Requirement for setuptools>=71
9+
10+
# Pytest specific deps
611
pytest==8.1.1
712
pytest-cov==5.0.0
8-
pytest-asyncio~=0.23.8
913
pytest-xdist==3.5.0
14+
# atomicwrites>=1.0 # Windows requirement
15+
# colorama>0.3.0 # Windows requirement
1016

11-
# this is needed for test_patches
12-
dill~=0.3.3
1317

14-
# this is needed for test_version
15-
tomli; python_version < "3.11"
18+
### aiobotocore dev dependencies
1619

17-
aiohttp${AIOHTTP_VERSION}
18-
19-
-e .[awscli,boto3]
20+
dill~=0.3.3 # Requirement for tests/test_patches.py
21+
docker~=7.1
22+
moto[server,s3,sqs,awslambda,dynamodb,cloudformation,sns,batch,ec2,rds]~=4.2.9
23+
pre-commit~=3.5.0
24+
pytest-asyncio~=0.23.8
25+
tomli; python_version < "3.11" # Requirement for tests/test_version.py

0 commit comments

Comments
 (0)