Skip to content

Commit 50c661e

Browse files
committed
The conflict is caused by:
The user requested py==1.8.0 pytest 6.2.5 depends on py>=1.8.2
1 parent 441b44c commit 50c661e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

vendor/ngc-tensorflow/requirements.21.10.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ albumentations==1.1.0
55
alembic==1.7.5
66
ansi2html==1.6.0
77
anyio
8-
apache-airflow[celery,devel,postgres,redis,s3,ssh]==1.10.15
8+
#apache-airflow[celery,devel,postgres,redis,s3,ssh]==1.10.6
99
apache-beam==2.34.0
1010
appdirs==1.4.3
1111
argo-workflows==3.6.1
1212
astor==0.8.1
13-
astroid==2.3.3
13+
astroid==2.8.5
1414
astropy==4.2.1
1515
async-timeout==4.0.0
1616
atlas==0.27.0
@@ -249,7 +249,7 @@ prometheus-flask-exporter==0.18.2
249249
ptyprocess==0.6.0
250250
pulp==2.5.1
251251
py-cpuinfo==5.0.0
252-
py==1.8.0
252+
py==1.8.2
253253
pyGObject==3.36.0
254254
pyLDAvis==2.1.2
255255
pyOpenSSL==19.1.0
@@ -273,7 +273,7 @@ pyflakes==2.1.1
273273
pygal==2.4.0
274274
pygame==2.0.1
275275
pyglet==1.5.0
276-
pylint>=2.7.0
276+
pylint==2.11.1
277277
pyls-black==0.4.4
278278
pymongo==3.10.1
279279
pynput==1.7.3

0 commit comments

Comments
 (0)