Skip to content
This repository was archived by the owner on Aug 25, 2024. It is now read-only.

Commit 6316dc3

Browse files
committed
Revert "release: 0.4.0: Pin dependency versions"
This reverts commit 4fecf8c.
1 parent 38ac83c commit 6316dc3

File tree

21 files changed

+71
-360
lines changed

21 files changed

+71
-360
lines changed

configloader/image/setup.cfg

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,7 @@ zip_safe = False
33
include_package_data = True
44
packages = find:
55
install_requires =
6-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.8"
7-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.7"
8-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.7"
9-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.7"
10-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.8"
11-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.8"
12-
opencv-python==4.5.1.48; platform_system == "Linux" and python_version == "3.8"
13-
opencv-python==4.5.1.48; platform_system == "Linux" and python_version == "3.7"
14-
opencv-python==4.5.1.48; platform_system == "Darwin" and python_version == "3.7"
15-
opencv-python==4.5.1.48; platform_system == "Windows" and python_version == "3.7"
16-
opencv-python==4.5.1.48; platform_system == "Darwin" and python_version == "3.8"
6+
dffml>=0.4.0
7+
opencv-python>=4.2.0.34
178
# See https://github.com/intel/dffml/issues/816
18-
numpy==1.19.5; platform_system == "Linux" and python_version == "3.8"
19-
numpy==1.19.5; platform_system == "Linux" and python_version == "3.7"
20-
numpy==1.19.5; platform_system == "Darwin" and python_version == "3.7"
21-
numpy==1.19.5; platform_system == "Windows" and python_version == "3.7"
22-
numpy==1.19.5; platform_system == "Darwin" and python_version == "3.8"
9+
numpy>=1.19.2

configloader/yaml/setup.cfg

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,5 @@ zip_safe = False
33
include_package_data = True
44
packages = find:
55
install_requires =
6-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.8"
7-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.7"
8-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.7"
9-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.7"
10-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.8"
11-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.8"
12-
PyYAML==5.4.1; platform_system == "Linux" and python_version == "3.8"
13-
PyYAML==5.4.1; platform_system == "Linux" and python_version == "3.7"
14-
PyYAML==5.4.1; platform_system == "Darwin" and python_version == "3.7"
15-
PyYAML==5.4.1; platform_system == "Windows" and python_version == "3.7"
16-
PyYAML==5.4.1; platform_system == "Darwin" and python_version == "3.8"
6+
dffml>=0.4.0
7+
PyYAML>=5.1.2

examples/shouldi/setup.cfg

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,38 +27,12 @@ zip_safe = False
2727
include_package_data = True
2828
packages = find:
2929
install_requires =
30-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.8"
31-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.7"
32-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.7"
33-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.7"
34-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.8"
35-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.8"
36-
dffml-feature-git==0.3.0; platform_system == "Linux" and python_version == "3.8"
37-
dffml-feature-git==0.3.0; platform_system == "Linux" and python_version == "3.7"
38-
dffml-feature-git==0.3.0; platform_system == "Darwin" and python_version == "3.7"
39-
dffml-feature-git==0.3.0; platform_system == "Windows" and python_version == "3.7"
40-
dffml-feature-git==0.3.0; platform_system == "Darwin" and python_version == "3.8"
41-
dffml-feature-git==0.3.0; platform_system == "Windows" and python_version == "3.8"
42-
aiohttp==3.7.3; platform_system == "Linux" and python_version == "3.8"
43-
aiohttp==3.7.3; platform_system == "Linux" and python_version == "3.7"
44-
aiohttp==3.7.3; platform_system == "Darwin" and python_version == "3.7"
45-
aiohttp==3.7.3; platform_system == "Windows" and python_version == "3.7"
46-
aiohttp==3.7.3; platform_system == "Darwin" and python_version == "3.8"
47-
bandit==1.7.0; platform_system == "Linux" and python_version == "3.8"
48-
bandit==1.7.0; platform_system == "Linux" and python_version == "3.7"
49-
bandit==1.7.0; platform_system == "Darwin" and python_version == "3.7"
50-
bandit==1.7.0; platform_system == "Windows" and python_version == "3.7"
51-
bandit==1.7.0; platform_system == "Darwin" and python_version == "3.8"
52-
safety==1.10.3; platform_system == "Linux" and python_version == "3.8"
53-
safety==1.10.3; platform_system == "Linux" and python_version == "3.7"
54-
safety==1.10.3; platform_system == "Darwin" and python_version == "3.7"
55-
safety==1.10.3; platform_system == "Windows" and python_version == "3.7"
56-
safety==1.10.3; platform_system == "Darwin" and python_version == "3.8"
57-
PyYAML==5.4.1; platform_system == "Linux" and python_version == "3.8"
58-
PyYAML==5.4.1; platform_system == "Linux" and python_version == "3.7"
59-
PyYAML==5.4.1; platform_system == "Darwin" and python_version == "3.7"
60-
PyYAML==5.4.1; platform_system == "Windows" and python_version == "3.7"
61-
PyYAML==5.4.1; platform_system == "Darwin" and python_version == "3.8"
30+
dffml>=0.4.0
31+
dffml-feature-git>=0.3.0
32+
aiohttp>=3.5.4
33+
bandit>=1.6.2
34+
safety>=1.8.5
35+
PyYAML>=5.1.2
6236

6337
[options.entry_points]
6438
console_scripts =

feature/auth/setup.cfg

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,4 @@ zip_safe = False
33
include_package_data = True
44
packages = find:
55
install_requires =
6-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.8"
7-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.7"
8-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.7"
9-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.7"
10-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.8"
11-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.8"
6+
dffml>=0.4.0

feature/git/setup.cfg

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,5 @@ zip_safe = False
33
include_package_data = True
44
packages = find:
55
install_requires =
6-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.8"
7-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.7"
8-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.7"
9-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.7"
10-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.8"
11-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.8"
12-
python-dateutil==2.8.1; platform_system == "Linux" and python_version == "3.8"
13-
python-dateutil==2.8.1; platform_system == "Linux" and python_version == "3.7"
14-
python-dateutil==2.8.1; platform_system == "Darwin" and python_version == "3.7"
15-
python-dateutil==2.8.1; platform_system == "Windows" and python_version == "3.7"
16-
python-dateutil==2.8.1; platform_system == "Darwin" and python_version == "3.8"
6+
dffml>=0.4.0
7+
python-dateutil>=2.7.3

model/autosklearn/setup.cfg

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,5 @@ zip_safe = False
33
include_package_data = True
44
packages = find:
55
install_requires =
6-
auto-sklearn==0.12.3; platform_system == "Linux" and python_version == "3.8"
7-
auto-sklearn==0.12.3; platform_system == "Linux" and python_version == "3.7"
8-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.8"
9-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.7"
10-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.7"
11-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.7"
12-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.8"
13-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.8"
6+
auto-sklearn>=0.12.1
7+
dffml>=0.4.0

model/daal4py/setup.cfg

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,9 @@ zip_safe = False
33
include_package_data = True
44
packages = find:
55
install_requires =
6-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.8"
7-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.7"
8-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.7"
9-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.7"
10-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.8"
11-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.8"
12-
pandas==1.2.2; platform_system == "Linux" and python_version == "3.8"
13-
pandas==1.2.2; platform_system == "Linux" and python_version == "3.7"
14-
pandas==1.2.2; platform_system == "Darwin" and python_version == "3.7"
15-
pandas==1.2.2; platform_system == "Windows" and python_version == "3.7"
16-
pandas==1.2.2; platform_system == "Darwin" and python_version == "3.8"
17-
joblib==1.0.1; platform_system == "Linux" and python_version == "3.8"
18-
joblib==1.0.1; platform_system == "Linux" and python_version == "3.7"
19-
joblib==1.0.1; platform_system == "Darwin" and python_version == "3.7"
20-
joblib==1.0.1; platform_system == "Windows" and python_version == "3.7"
21-
joblib==1.0.1; platform_system == "Darwin" and python_version == "3.8"
6+
dffml>=0.4.0
7+
pandas>=0.25.0
8+
joblib>=0.13.2
229
# See https://github.com/intel/dffml/issues/816
23-
numpy==1.19.5; platform_system == "Linux" and python_version == "3.8"
24-
numpy==1.19.5; platform_system == "Linux" and python_version == "3.7"
25-
numpy==1.19.5; platform_system == "Darwin" and python_version == "3.7"
26-
numpy==1.19.5; platform_system == "Windows" and python_version == "3.7"
27-
numpy==1.19.5; platform_system == "Darwin" and python_version == "3.8"
28-
daal4py==2021.1; platform_system == "Linux" and python_version == "3.8"
29-
daal4py==2021.1; platform_system == "Linux" and python_version == "3.7"
10+
numpy>=1.19.2
11+
daal4py>=2021.1

model/pytorch/setup.cfg

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,11 @@ zip_safe = False
33
include_package_data = True
44
packages = find:
55
install_requires =
6-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.8"
7-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.7"
8-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.7"
9-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.7"
10-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.8"
11-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.8"
12-
torch==1.7.1; platform_system == "Linux" and python_version == "3.8"
13-
torch==1.7.1; platform_system == "Linux" and python_version == "3.7"
14-
torch==1.7.1; platform_system == "Darwin" and python_version == "3.7"
15-
torch==1.7.1+cu110; platform_system == "Windows" and python_version == "3.7"
16-
torch==1.7.1; platform_system == "Darwin" and python_version == "3.8"
17-
torchvision==0.8.2; platform_system == "Linux" and python_version == "3.8"
18-
torchvision==0.8.2; platform_system == "Linux" and python_version == "3.7"
19-
torchvision==0.8.2; platform_system == "Darwin" and python_version == "3.7"
20-
torchvision==0.8.2+cu110; platform_system == "Windows" and python_version == "3.7"
21-
torchvision==0.8.2; platform_system == "Darwin" and python_version == "3.8"
6+
dffml>=0.4.0
7+
torch>=1.6.0
8+
torchvision>=0.7.0
229
# See https://github.com/intel/dffml/issues/816
23-
numpy==1.19.5; platform_system == "Linux" and python_version == "3.8"
24-
numpy==1.19.5; platform_system == "Linux" and python_version == "3.7"
25-
numpy==1.19.5; platform_system == "Darwin" and python_version == "3.7"
26-
numpy==1.19.5; platform_system == "Windows" and python_version == "3.7"
27-
numpy==1.19.5; platform_system == "Darwin" and python_version == "3.8"
10+
numpy>=1.19.2
2811
tests_require =
2912
dffml-config-image>=0.1.0
3013
dffml-config-yaml>=0.1.0

model/scikit/setup.cfg

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,9 @@ zip_safe = False
33
include_package_data = True
44
packages = find:
55
install_requires =
6-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.8"
7-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.7"
8-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.7"
9-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.7"
10-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.8"
11-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.8"
12-
scipy==1.4.1; platform_system == "Linux" and python_version == "3.8"
13-
scipy==1.4.1; platform_system == "Linux" and python_version == "3.7"
14-
scipy==1.4.1; platform_system == "Darwin" and python_version == "3.7"
15-
scipy==1.4.1; platform_system == "Windows" and python_version == "3.7"
16-
scipy==1.4.1; platform_system == "Darwin" and python_version == "3.8"
17-
scikit-learn==0.24.1; platform_system == "Linux" and python_version == "3.8"
18-
scikit-learn==0.24.1; platform_system == "Linux" and python_version == "3.7"
19-
scikit-learn==0.24.1; platform_system == "Darwin" and python_version == "3.7"
20-
scikit-learn==0.24.1; platform_system == "Windows" and python_version == "3.7"
21-
scikit-learn==0.24.1; platform_system == "Darwin" and python_version == "3.8"
22-
joblib==1.0.1; platform_system == "Linux" and python_version == "3.8"
23-
joblib==1.0.1; platform_system == "Linux" and python_version == "3.7"
24-
joblib==1.0.1; platform_system == "Darwin" and python_version == "3.7"
25-
joblib==1.0.1; platform_system == "Windows" and python_version == "3.7"
26-
joblib==1.0.1; platform_system == "Darwin" and python_version == "3.8"
27-
pandas==1.2.2; platform_system == "Linux" and python_version == "3.8"
28-
pandas==1.2.2; platform_system == "Linux" and python_version == "3.7"
29-
pandas==1.2.2; platform_system == "Darwin" and python_version == "3.7"
30-
pandas==1.2.2; platform_system == "Windows" and python_version == "3.7"
31-
pandas==1.2.2; platform_system == "Darwin" and python_version == "3.8"
6+
dffml>=0.4.0
7+
scipy==1.4.1
8+
scikit-learn>=0.21.2
9+
joblib>=0.13.2
10+
pandas>=0.25.0
11+

model/scratch/setup.cfg

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ zip_safe = False
33
include_package_data = True
44
packages = find:
55
install_requires =
6-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.8"
7-
dffml==0.4.0; platform_system == "Linux" and python_version == "3.7"
8-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.7"
9-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.7"
10-
dffml==0.4.0; platform_system == "Darwin" and python_version == "3.8"
11-
dffml==0.4.0; platform_system == "Windows" and python_version == "3.8"
6+
dffml>=0.4.0
127
# See https://github.com/intel/dffml/issues/816
13-
numpy==1.19.5; platform_system == "Linux" and python_version == "3.8"
14-
numpy==1.19.5; platform_system == "Linux" and python_version == "3.7"
15-
numpy==1.19.5; platform_system == "Darwin" and python_version == "3.7"
16-
numpy==1.19.5; platform_system == "Windows" and python_version == "3.7"
17-
numpy==1.19.5; platform_system == "Darwin" and python_version == "3.8"
8+
numpy>=1.19.2

0 commit comments

Comments
 (0)