Skip to content

Commit d046283

Browse files
committed
fixed conflict extension
1 parent bb866fa commit d046283

File tree

1 file changed

+20
-7
lines changed

1 file changed

+20
-7
lines changed

vendor/ngc-tensorflow/requirements.22.03.txt

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,26 +156,39 @@ Jinja2==2.11.3
156156
json-tricks==3.14.0
157157
jsonpickle==1.5.2
158158
jsonschema==4.0.1
159-
jupyter-console==6.1.0
159+
#jupyterlab-nvdashboard==0.5.0
160+
jupyter-client==6.1.12
161+
jupyter-console==6.2.0
160162
jupyter-contrib-core==0.3.3
161163
jupyter-contrib-nbextensions==0.5.1
162164
jupyter-dash==0.4.0
163165
jupyter-highlight-selected-word==0.2.0
164166
jupyter-js-widgets-nbextension==0.0.2.dev0
167+
jupyter-kite==1.2.0
165168
jupyter-latex-envs==1.4.6
166169
jupyter-lsp==1.2.0
167170
jupyter-nbextensions-configurator==0.4.1
168-
jupyter-server-proxy==1.2.0
171+
jupyter-packaging==0.9.2
172+
jupyter-server-mathjax
173+
jupyter-server-proxy==1.6.0
174+
jupyter-server
175+
jupyter-telemetry==0.1.0
169176
jupyter==1.0.0
170177
jupyter_bokeh==2.0.4
171-
jupyterlab-git
172-
jupyterlab-github==2.0.0
178+
jupyterhub==2.2.2
179+
jupyterhub-jwtauthenticator==0.1
180+
jupyterhub-kubespawner==0.16.1
181+
jupyterhubutils==0.25.0
182+
jupyterlab-code-formatter==1.4.10
183+
#jupyterlab-git
184+
#jupyterlab-github==2.0.0
185+
jupyterlab-hdf==0.5.1
186+
jupyterlab-launcher==0.13.1
173187
jupyterlab-lsp==3.6.0
174-
jupyterlab_hdf==0.3.0
175188
jupyterlabutils
176189
jupyterthemes==0.20.0
177190
jupytext==1.13.7
178-
keras==2.8.0
191+
keras==2.7.0
179192
Keras-Applications==1.0.8
180193
keras-models
181194
kiwisolver==1.1.0
@@ -211,7 +224,7 @@ multiprocess==0.70.9
211224
munch==2.5.0
212225
mxnet
213226
namedlist==1.7
214-
nbclassic==0.2.7
227+
nbclassic>=0.2.87
215228
nbdime==3.0.0
216229
netifaces==0.10.9
217230
networkx==2.4

0 commit comments

Comments
 (0)