Skip to content

Commit d8d319b

Browse files
committed
Isolate pinned dependencies to dev_requirements dir
1 parent cefbff1 commit d8d319b

12 files changed

+29
-28
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ version: 2
22
updates:
33
# master
44
- package-ecosystem: "pip"
5-
directory: "/"
5+
directory: "/dev_requirements"
66
schedule:
77
interval: "daily"
88

99
# mainline-1.x
1010
- package-ecosystem: "pip"
11-
directory: "/"
11+
directory: "/dev_requirements"
1212
schedule:
1313
interval: "daily"
1414
target-branch: "mainline-1.x"
1515

1616
# mainline-2.x
1717
- package-ecosystem: "pip"
18-
directory: "/"
18+
directory: "/dev_requirements"
1919
schedule:
2020
interval: "daily"
2121
target-branch: "mainline-2.x"

.github/workflows/ci_decrypt-oracle.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
python-version: 3.6
1919
- run: |
2020
python -m pip install --upgrade pip
21-
pip install --upgrade -r ci-requirements.txt
21+
pip install --upgrade -r dev_requirements/ci-requirements.txt
2222
- name: run test
2323
env:
2424
TOXENV: local
@@ -44,7 +44,7 @@ jobs:
4444
python-version: 3.8
4545
- run: |
4646
python -m pip install --upgrade pip
47-
pip install --upgrade -r ci-requirements.txt
47+
pip install --upgrade -r dev_requirements/ci-requirements.txt
4848
- name: run test
4949
env:
5050
TOXENV: ${{ matrix.category }}

.github/workflows/ci_static-analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
python-version: 3.8
3434
- run: |
3535
python -m pip install --upgrade pip
36-
pip install --upgrade -r ci-requirements.txt
36+
pip install --upgrade -r dev_requirements/ci-requirements.txt
3737
- name: run test
3838
env:
3939
TOXENV: ${{ matrix.category }}

.github/workflows/ci_test-vector-handler.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
architecture: ${{ matrix.architecture }}
5353
- run: |
5454
python -m pip install --upgrade pip
55-
pip install --upgrade -r ci-requirements.txt
55+
pip install --upgrade -r dev_requirements/ci-requirements.txt
5656
- name: run test
5757
env:
5858
TOXENV: ${{ matrix.category }}
@@ -78,7 +78,7 @@ jobs:
7878
python-version: 3.8
7979
- run: |
8080
python -m pip install --upgrade pip
81-
pip install --upgrade -r ci-requirements.txt
81+
pip install --upgrade -r dev_requirements/ci-requirements.txt
8282
- name: run test
8383
env:
8484
TOXENV: ${{ matrix.category }}

.github/workflows/ci_tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
architecture: ${{ matrix.architecture }}
5858
- run: |
5959
python -m pip install --upgrade pip
60-
pip install --upgrade -r ci-requirements.txt
60+
pip install --upgrade -r dev_requirements/ci-requirements.txt
6161
- name: run test
6262
env:
6363
TOXENV: ${{ matrix.category }}
@@ -77,7 +77,7 @@ jobs:
7777
python-version: 3.7
7878
- run: |
7979
python -m pip install --upgrade pip
80-
pip install --upgrade -r ci-requirements.txt
80+
pip install --upgrade -r dev_requirements/ci-requirements.txt
8181
- name: run test
8282
env:
8383
TOXENV: ${{ matrix.category }}
File renamed without changes.
File renamed without changes.

linter-requirements.txt renamed to dev_requirements/linter-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ pyflakes==2.4.0
1010
pylint==2.12.2
1111
readme_renderer==32.0
1212
seed-isort-config==2.2.0
13-
sphinx==4.3.1
1413
vulture==2.3
File renamed without changes.
File renamed without changes.

test/freeze-upstream-requirements.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ if [ -z ${1} ]; then
66
fi
77

88
pip install -r requirements.txt
9-
pip install -r test/requirements.txt
9+
pip install -r dev_requirements/test-requirements.txt
1010
pip freeze > ${1}

tox.ini

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ passenv =
6161
# Pass through custom pip config file settings
6262
PIP_CONFIG_FILE
6363
sitepackages = False
64-
deps = -rtest/requirements.txt
64+
deps = -rdev_requirements/test-requirements.txt
6565
commands =
6666
local: {[testenv:base-command]commands} test/ -m local
6767
integ: {[testenv:base-command]commands} test/ -m integ
@@ -83,7 +83,7 @@ sitepackages = False
8383
passenv =
8484
setenv =
8585
#########################################################
86-
deps = -rtest/requirements.txt
86+
deps = -rdev_requirements/test-requirements.txt
8787
commands = {[testenv:base-command]commands} test/ -m local
8888

8989
# Collect requirements for use in upstream tests
@@ -120,13 +120,13 @@ commands = {[testenv:test-upstream-requirements-base]commands}
120120
# Linters
121121
[testenv:flake8]
122122
basepython = python3
123-
deps = -rlinter-requirements.txt
123+
deps = -rdev_requirements/linter-requirements.txt
124124
commands =
125125
flake8 src/aws_encryption_sdk/ setup.py
126126

127127
[testenv:flake8-tests]
128128
basepython = {[testenv:flake8]basepython}
129-
deps = -rlinter-requirements.txt
129+
deps = -rdev_requirements/linter-requirements.txt
130130
commands =
131131
flake8 \
132132
# Ignore F811 redefinition errors in tests (breaks with pytest-mock use)
@@ -151,7 +151,7 @@ commands =
151151
basepython = python3
152152
deps =
153153
{[testenv]deps}
154-
-rlinter-requirements.txt
154+
-rdev_requirements/linter-requirements.txt
155155
commands =
156156
pylint \
157157
--rcfile=src/pylintrc \
@@ -178,7 +178,7 @@ commands =
178178

179179
[testenv:blacken-src]
180180
basepython = python3
181-
deps = -rlinter-requirements.txt
181+
deps = -rdev_requirements/linter-requirements.txt
182182
commands =
183183
black --line-length 120 \
184184
src/aws_encryption_sdk/ \
@@ -205,12 +205,12 @@ commands =
205205

206206
[testenv:isort-seed]
207207
basepython = python3
208-
deps = -rlinter-requirements.txt
208+
deps = -rdev_requirements/linter-requirements.txt
209209
commands = seed-isort-config
210210

211211
[testenv:isort]
212212
basepython = python3
213-
deps = -rlinter-requirements.txt
213+
deps = -rdev_requirements/linter-requirements.txt
214214
commands = isort -rc \
215215
src \
216216
test \
@@ -236,23 +236,25 @@ commands =
236236

237237
[testenv:doc8]
238238
basepython = python3
239-
deps = -rlinter-requirements.txt
239+
deps =
240+
-rdev_requirements/linter-requirements.txt
241+
-rdev_requirements/doc-requirements.txt
240242
commands = doc8 doc/index.rst README.rst CHANGELOG.rst
241243

242244
[testenv:readme]
243245
basepython = python3
244-
deps = -rlinter-requirements.txt
246+
deps = -rdev_requirements/linter-requirements.txt
245247
commands = python setup.py check -r -s
246248

247249
[testenv:bandit]
248250
basepython = python3
249-
deps = -rlinter-requirements.txt
251+
deps = -rdev_requirements/linter-requirements.txt
250252
commands = bandit -r src/aws_encryption_sdk/
251253

252254
# Prone to false positives: only run independently
253255
[testenv:vulture]
254256
basepython = python3
255-
deps = -rlinter-requirements.txt
257+
deps = -rdev_requirements/linter-requirements.txt
256258
commands = vulture src/aws_encryption_sdk/
257259

258260
[testenv:linters]
@@ -291,7 +293,7 @@ commands =
291293
# Documentation
292294
[testenv:docs]
293295
basepython = python3
294-
deps = -rdoc/requirements.txt
296+
deps = -rdev_requirements/doc-requirements.txt
295297
commands =
296298
sphinx-build -E -c doc/ -b html doc/ doc/build/html
297299

@@ -307,20 +309,20 @@ commands =
307309
[testenv:park]
308310
basepython = python3
309311
skip_install = true
310-
deps = -rrelease-requirements.txt
312+
deps = -rdev_requirements/release-requirements.txt
311313
commands = python setup.py park
312314

313315
[testenv:build]
314316
basepython = python3
315317
skip_install = true
316-
deps = -rrelease-requirements.txt
318+
deps = -rdev_requirements/release-requirements.txt
317319
commands =
318320
python setup.py sdist bdist_wheel
319321

320322
[testenv:release-base]
321323
basepython = python3
322324
skip_install = true
323-
deps = -rrelease-requirements.txt
325+
deps = -rdev_requirements/release-requirements.txt
324326
passenv =
325327
# Intentionally omit TWINE_REPOSITORY_URL from the passenv list,
326328
# as this overrides other ways of setting the repository and could

0 commit comments

Comments
 (0)