Skip to content

Commit 137e306

Browse files
WovchenaWovchena
authored
Merge pull request #3594 from nignatovskiy/ni/update_reqs
Update CI requirements to Python 3.8 (Ubuntu20 - OV 2022.2)
2 parents 7fabfbb + 0e31b46 commit 137e306

9 files changed

+574
-346
lines changed

‎ci/requirements-ac-test.txt

Lines changed: 33 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@ click==8.0.1
1212
# via
1313
# nltk
1414
# sacremoses
15-
cycler==0.10.0
16-
# via matplotlib
17-
dataclasses==0.8
18-
# via transformers
1915
decorator==4.4.2
2016
# via networkx
2117
defusedxml==0.7.1
2218
# via -r tools/accuracy_checker/requirements-core.in
2319
fast-ctc-decode==0.3.0
24-
# via -r tools/accuracy_checker/requirements.in
20+
# via -r tools/accuracy_checker/requirements-extra.in
2521
filelock==3.0.12
2622
# via
2723
# huggingface-hub
@@ -30,42 +26,32 @@ huggingface-hub==0.0.16
3026
# via transformers
3127
idna==3.2
3228
# via requests
33-
imagecodecs==2020.5.30 ; python_version < "3.7"
34-
# via -r tools/accuracy_checker/requirements.in
29+
imagecodecs==2022.2.22 ; python_version >= "3.8"
30+
# via -r tools/accuracy_checker/requirements-extra.in
3531
imageio==2.9.0
3632
# via scikit-image
37-
importlib-metadata==4.8.1
38-
# via
39-
# click
40-
# huggingface-hub
41-
# pluggy
42-
# pytest
43-
# transformers
4433
joblib==1.0.1
4534
# via
4635
# nltk
4736
# sacremoses
4837
# scikit-learn
49-
kiwisolver==1.3.1
50-
# via matplotlib
5138
lmdb==1.2.1
52-
# via -r tools/accuracy_checker/requirements.in
53-
matplotlib==3.3.4
54-
# via scikit-image
39+
# via -r tools/accuracy_checker/requirements-extra.in
5540
more-itertools==8.9.0
5641
# via pytest
57-
networkx==2.5.1
58-
# via scikit-image
42+
networkx==2.5.1 ; python_version >= "3.7"
43+
# via
44+
# -r tools/accuracy_checker/requirements-extra.in
45+
# scikit-image
5946
nibabel==3.2.1
60-
# via -r tools/accuracy_checker/requirements.in
47+
# via -r tools/accuracy_checker/requirements-extra.in
6148
nltk==3.6.2
62-
# via -r tools/accuracy_checker/requirements.in
49+
# via -r tools/accuracy_checker/requirements-extra.in
6350
numpy==1.19.5
6451
# via
6552
# -r tools/accuracy_checker/requirements-core.in
6653
# imagecodecs
6754
# imageio
68-
# matplotlib
6955
# nibabel
7056
# pandas
7157
# parasail
@@ -83,41 +69,37 @@ packaging==21.0
8369
# huggingface-hub
8470
# nibabel
8571
# pytest
72+
# scikit-image
8673
# transformers
8774
pandas==1.1.5
88-
# via -r tools/accuracy_checker/requirements.in
89-
parasail==1.2.4
90-
# via -r tools/accuracy_checker/requirements.in
75+
# via -r tools/accuracy_checker/requirements-extra.in
76+
parasail==1.2.4 ; platform_system != "Windows"
77+
# via -r tools/accuracy_checker/requirements-extra.in
9178
pillow==8.3.2
9279
# via
9380
# -r tools/accuracy_checker/requirements-core.in
9481
# imageio
95-
# matplotlib
9682
# scikit-image
9783
pluggy==0.13.1
9884
# via pytest
9985
py==1.10.0
10086
# via pytest
10187
py-cpuinfo==8.0.0
102-
# via -r tools/accuracy_checker/requirements.in
88+
# via -r tools/accuracy_checker/requirements-extra.in
10389
pyclipper==1.3.0
104-
# via -r tools/accuracy_checker/requirements.in
90+
# via -r tools/accuracy_checker/requirements-extra.in
10591
pydicom==2.2.1
106-
# via -r tools/accuracy_checker/requirements.in
92+
# via -r tools/accuracy_checker/requirements-extra.in
10793
pyparsing==2.4.7
108-
# via
109-
# matplotlib
110-
# packaging
94+
# via packaging
11195
pytest==5.4.3
11296
# via
11397
# -r tools/accuracy_checker/requirements-test.in
11498
# pytest-mock
11599
pytest-mock==2.0.0
116100
# via -r tools/accuracy_checker/requirements-test.in
117101
python-dateutil==2.8.2
118-
# via
119-
# matplotlib
120-
# pandas
102+
# via pandas
121103
pytz==2021.1
122104
# via pandas
123105
pywavelets==1.1.1
@@ -126,8 +108,8 @@ pyyaml==5.4.1
126108
# via
127109
# -r tools/accuracy_checker/requirements-core.in
128110
# transformers
129-
rawpy==0.16.0
130-
# via -r tools/accuracy_checker/requirements.in
111+
rawpy==0.17.2 ; python_version >= "3.7"
112+
# via -r tools/accuracy_checker/requirements-extra.in
131113
regex==2021.8.28
132114
# via
133115
# nltk
@@ -140,19 +122,19 @@ requests==2.26.0
140122
# transformers
141123
sacremoses==0.0.45
142124
# via transformers
143-
scikit-image==0.17.2
144-
# via -r tools/accuracy_checker/requirements.in
125+
scikit-image==0.19.3 ; python_version >= "3.7"
126+
# via -r tools/accuracy_checker/requirements-extra.in
145127
scikit-learn==0.24.2
146-
# via -r tools/accuracy_checker/requirements.in
128+
# via -r tools/accuracy_checker/requirements-extra.in
147129
scipy==1.5.4
148130
# via
149-
# -r tools/accuracy_checker/requirements.in
131+
# -r tools/accuracy_checker/requirements-extra.in
150132
# scikit-image
151133
# scikit-learn
152134
sentencepiece==0.1.96
153-
# via -r tools/accuracy_checker/requirements.in
135+
# via -r tools/accuracy_checker/requirements-extra.in
154136
shapely==1.7.1
155-
# via -r tools/accuracy_checker/requirements.in
137+
# via -r tools/accuracy_checker/requirements-extra.in
156138
six==1.16.0
157139
# via
158140
# python-dateutil
@@ -161,26 +143,22 @@ threadpoolctl==2.2.0
161143
# via scikit-learn
162144
tifffile==2020.9.3
163145
# via scikit-image
164-
tokenizers==0.10.3
146+
tokenizers==0.10.3 ; python_version >= "3.7"
165147
# via
166-
# -r tools/accuracy_checker/requirements.in
148+
# -r tools/accuracy_checker/requirements-extra.in
167149
# transformers
168150
tqdm==4.62.2
169151
# via
170-
# -r tools/accuracy_checker/requirements.in
152+
# -r tools/accuracy_checker/requirements-extra.in
171153
# huggingface-hub
172154
# nltk
173155
# sacremoses
174156
# transformers
175-
transformers==4.10.0
176-
# via -r tools/accuracy_checker/requirements.in
157+
transformers==4.10.0 ; python_version >= "3.7"
158+
# via -r tools/accuracy_checker/requirements-extra.in
177159
typing-extensions==3.10.0.2
178-
# via
179-
# huggingface-hub
180-
# importlib-metadata
160+
# via huggingface-hub
181161
urllib3==1.26.6
182162
# via requests
183163
wcwidth==0.2.5
184164
# via pytest
185-
zipp==3.5.0
186-
# via importlib-metadata

‎ci/requirements-ac.txt

Lines changed: 33 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@ click==8.0.1
88
# via
99
# nltk
1010
# sacremoses
11-
cycler==0.10.0
12-
# via matplotlib
13-
dataclasses==0.8
14-
# via transformers
1511
decorator==4.4.2
1612
# via networkx
1713
defusedxml==0.7.1
1814
# via -r tools/accuracy_checker/requirements-core.in
1915
fast-ctc-decode==0.3.0
20-
# via -r tools/accuracy_checker/requirements.in
16+
# via -r tools/accuracy_checker/requirements-extra.in
2117
filelock==3.0.12
2218
# via
2319
# huggingface-hub
@@ -26,38 +22,30 @@ huggingface-hub==0.0.16
2622
# via transformers
2723
idna==3.2
2824
# via requests
29-
imagecodecs==2020.5.30 ; python_version < "3.7"
30-
# via -r tools/accuracy_checker/requirements.in
25+
imagecodecs==2022.2.22 ; python_version >= "3.8"
26+
# via -r tools/accuracy_checker/requirements-extra.in
3127
imageio==2.9.0
3228
# via scikit-image
33-
importlib-metadata==4.8.1
34-
# via
35-
# click
36-
# huggingface-hub
37-
# transformers
3829
joblib==1.0.1
3930
# via
4031
# nltk
4132
# sacremoses
4233
# scikit-learn
43-
kiwisolver==1.3.1
44-
# via matplotlib
4534
lmdb==1.2.1
46-
# via -r tools/accuracy_checker/requirements.in
47-
matplotlib==3.3.4
48-
# via scikit-image
49-
networkx==2.5.1
50-
# via scikit-image
35+
# via -r tools/accuracy_checker/requirements-extra.in
36+
networkx==2.5.1 ; python_version >= "3.7"
37+
# via
38+
# -r tools/accuracy_checker/requirements-extra.in
39+
# scikit-image
5140
nibabel==3.2.1
52-
# via -r tools/accuracy_checker/requirements.in
41+
# via -r tools/accuracy_checker/requirements-extra.in
5342
nltk==3.6.2
54-
# via -r tools/accuracy_checker/requirements.in
43+
# via -r tools/accuracy_checker/requirements-extra.in
5544
numpy==1.19.5
5645
# via
5746
# -r tools/accuracy_checker/requirements-core.in
5847
# imagecodecs
5948
# imageio
60-
# matplotlib
6149
# nibabel
6250
# pandas
6351
# parasail
@@ -74,31 +62,27 @@ packaging==21.0
7462
# via
7563
# huggingface-hub
7664
# nibabel
65+
# scikit-image
7766
# transformers
7867
pandas==1.1.5
79-
# via -r tools/accuracy_checker/requirements.in
80-
parasail==1.2.4
81-
# via -r tools/accuracy_checker/requirements.in
68+
# via -r tools/accuracy_checker/requirements-extra.in
69+
parasail==1.2.4 ; platform_system != "Windows"
70+
# via -r tools/accuracy_checker/requirements-extra.in
8271
pillow==8.3.2
8372
# via
8473
# -r tools/accuracy_checker/requirements-core.in
8574
# imageio
86-
# matplotlib
8775
# scikit-image
8876
py-cpuinfo==8.0.0
89-
# via -r tools/accuracy_checker/requirements.in
77+
# via -r tools/accuracy_checker/requirements-extra.in
9078
pyclipper==1.3.0
91-
# via -r tools/accuracy_checker/requirements.in
79+
# via -r tools/accuracy_checker/requirements-extra.in
9280
pydicom==2.2.1
93-
# via -r tools/accuracy_checker/requirements.in
81+
# via -r tools/accuracy_checker/requirements-extra.in
9482
pyparsing==2.4.7
95-
# via
96-
# matplotlib
97-
# packaging
83+
# via packaging
9884
python-dateutil==2.8.2
99-
# via
100-
# matplotlib
101-
# pandas
85+
# via pandas
10286
pytz==2021.1
10387
# via pandas
10488
pywavelets==1.1.1
@@ -107,8 +91,8 @@ pyyaml==5.4.1
10791
# via
10892
# -r tools/accuracy_checker/requirements-core.in
10993
# transformers
110-
rawpy==0.16.0
111-
# via -r tools/accuracy_checker/requirements.in
94+
rawpy==0.17.2 ; python_version >= "3.7"
95+
# via -r tools/accuracy_checker/requirements-extra.in
11296
regex==2021.8.28
11397
# via
11498
# nltk
@@ -121,19 +105,19 @@ requests==2.26.0
121105
# transformers
122106
sacremoses==0.0.45
123107
# via transformers
124-
scikit-image==0.17.2
125-
# via -r tools/accuracy_checker/requirements.in
108+
scikit-image==0.19.3 ; python_version >= "3.7"
109+
# via -r tools/accuracy_checker/requirements-extra.in
126110
scikit-learn==0.24.2
127-
# via -r tools/accuracy_checker/requirements.in
111+
# via -r tools/accuracy_checker/requirements-extra.in
128112
scipy==1.5.4
129113
# via
130-
# -r tools/accuracy_checker/requirements.in
114+
# -r tools/accuracy_checker/requirements-extra.in
131115
# scikit-image
132116
# scikit-learn
133117
sentencepiece==0.1.96
134-
# via -r tools/accuracy_checker/requirements.in
118+
# via -r tools/accuracy_checker/requirements-extra.in
135119
shapely==1.7.1
136-
# via -r tools/accuracy_checker/requirements.in
120+
# via -r tools/accuracy_checker/requirements-extra.in
137121
six==1.16.0
138122
# via
139123
# python-dateutil
@@ -142,24 +126,20 @@ threadpoolctl==2.2.0
142126
# via scikit-learn
143127
tifffile==2020.9.3
144128
# via scikit-image
145-
tokenizers==0.10.3
129+
tokenizers==0.10.3 ; python_version >= "3.7"
146130
# via
147-
# -r tools/accuracy_checker/requirements.in
131+
# -r tools/accuracy_checker/requirements-extra.in
148132
# transformers
149133
tqdm==4.62.2
150134
# via
151-
# -r tools/accuracy_checker/requirements.in
135+
# -r tools/accuracy_checker/requirements-extra.in
152136
# huggingface-hub
153137
# nltk
154138
# sacremoses
155139
# transformers
156-
transformers==4.10.0
157-
# via -r tools/accuracy_checker/requirements.in
140+
transformers==4.10.0 ; python_version >= "3.7"
141+
# via -r tools/accuracy_checker/requirements-extra.in
158142
typing-extensions==3.10.0.2
159-
# via
160-
# huggingface-hub
161-
# importlib-metadata
143+
# via huggingface-hub
162144
urllib3==1.26.6
163145
# via requests
164-
zipp==3.5.0
165-
# via importlib-metadata

‎ci/requirements-check-basics.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ gitdb==4.0.7
1212
# via gitpython
1313
gitpython==3.1.18
1414
# via bandit
15-
importlib-metadata==4.8.1
16-
# via
17-
# flake8
18-
# flake8-comprehensions
19-
# stevedore
2015
mccabe==0.6.1
2116
# via flake8
2217
mistune==2.0.0
@@ -40,14 +35,8 @@ smmap==4.0.0
4035
# via gitdb
4136
stevedore==3.4.0
4237
# via bandit
43-
typing-extensions==3.10.0.2
44-
# via
45-
# gitpython
46-
# importlib-metadata
4738
yamllint==1.26.3
4839
# via -r ci/requirements-check-basics.in
49-
zipp==3.5.0
50-
# via importlib-metadata
5140

5241
# The following packages are considered to be unsafe in a requirements file:
5342
# setuptools

0 commit comments

Comments
 (0)