Skip to content

Commit 895b0f9

Browse files
authored
🔧 dask compatible requirements listings (ITISFoundation#2420)
* Add option to strip extras. It is redundant and prevents producing dask constraint reqs variants * creates dask constraint reqs variants * small test to ensure synced reqs * updated -c everywhere * uses long version of pip flags
1 parent 1c816d3 commit 895b0f9

File tree

117 files changed

+684
-407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+684
-407
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ WIP: work in progress
55
Consider prefix your PR message with an emoticon
66
🐛 bugfix
77
✨ new feature
8-
🔨 refactoring
9-
🏗️ maintenance
10-
📚 documentation
11-
12-
or get your emoji from https://gitmoji.dev/
8+
♻️ refactoring
9+
💄 updates UI or 🚸 UX/usability
10+
🚑️ hotfix
11+
⚗️ experimental
12+
⬆️ upgrades dependencies
13+
📝 documentation
14+
or from https://gitmoji.dev/
1315
1416
and append (⚠️ devops) if changes in devops configuration required before deploying
1517
-->

api/tests/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-c ../../requirements/constraints.txt
1+
--constraint ../../requirements/constraints.txt
22

33
# testing
44
coverage

packages/models-library/requirements/_base.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Specifies third-party dependencies for 'models-library'
33
#
4-
-c ../../../requirements/constraints.txt
4+
--constraint ../../../requirements/constraints.txt
55

66
pydantic[email]
77

packages/models-library/requirements/_test.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#
22
# Specifies dependencies required to run 'models-library'
33
#
4-
-c ../../../requirements/constraints.txt
4+
--constraint ../../../requirements/constraints.txt
55

66
# Adds base AS CONSTRAINT specs, not requirement.
77
# - Resulting _text.txt is a frozen list of EXTRA packages for testing, besides _base.txt
88
#
9-
-c _base.txt
9+
--constraint _base.txt
1010

1111
# testing
1212
coverage
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
-c ../../../requirements/constraints.txt
2-
-c _base.txt
3-
-c _test.txt
1+
--constraint ../../../requirements/constraints.txt
2+
--constraint _base.txt
3+
--constraint _test.txt
44

5-
-r ../../../requirements/devenv.txt
5+
--requirement ../../../requirements/devenv.txt

packages/models-library/requirements/ci.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#
88

99
# installs base + tests requirements
10-
-r _base.txt
11-
-r _test.txt
10+
--requirement _base.txt
11+
--requirement _test.txt
1212

1313
# installs this repo's packages
1414
../pytest-simcore/

packages/models-library/requirements/dev.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
#
88

99
# installs base + tests requirements
10-
-r _base.txt
11-
-r _test.txt
12-
-r _tools.txt
10+
--requirement _base.txt
11+
--requirement _test.txt
12+
--requirement _tools.txt
1313

1414
# installs this repo's packages
15-
-e ../pytest-simcore/
16-
-e ../postgres-database/[migration]
15+
--editable ../pytest-simcore/
16+
--editable ../postgres-database/[migration]
1717

1818
# current module
19-
-e .
19+
--editable .

packages/postgres-database/requirements/_base.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Specifies third-party dependencies for 'simcore-postgres-database'
33
#
4-
-c ../../../requirements/constraints.txt
4+
--constraint ../../../requirements/constraints.txt
55

66
# sqlalchemy[postgresql_psycopg2binary]<1.4,>=1.1 (from aiopg[sa]==1.2.1->-r requirements/_test.in (line 14))
77
sqlalchemy[postgresql_psycopg2binary]<1.4,>=1.1

packages/postgres-database/requirements/_migration.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# NOTE: this is an EXTRA!
44

55
# Adds base AS CONSTRAINT specs, not requirement.
6-
-c ../../../requirements/constraints.txt
7-
-c _base.txt
6+
--constraint ../../../requirements/constraints.txt
7+
--constraint _base.txt
88

99
# There are incompatible versions in the resolved dependencies:
1010
# websocket-client==1.1.0 (from -c requirements/_migration.txt (line 51))

packages/postgres-database/requirements/_test.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#
22
# Specifies dependencies required to run tests on 'simcore-postgres-database'
33
#
4-
-c ../../../requirements/constraints.txt
4+
--constraint ../../../requirements/constraints.txt
55

66
# Adds base AS CONSTRAINT specs, not requirement.
77
# - Resulting _text.txt is a frozen list of EXTRA packages for testing, besides _base.txt
88
#
9-
-c _base.txt
10-
-c _migration.txt
9+
--constraint _base.txt
10+
--constraint _migration.txt
1111

1212
# fixtures
1313
pyyaml

0 commit comments

Comments
 (0)