1
- <<<<<<< HEAD
2
- #SoundFile==0.10.3.post1
3
- #Werkzeug==2.0.3
4
- #certifi==2021.10.8
5
- =======
6
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
7
1
#certifi==2021.10.8
8
2
#entrypoints==0.4
9
3
#importlib_resources==5.7.1
10
4
#jsonschema==4.4.0
11
5
#oauthlib==3.2.0
12
- <<<<<<< HEAD
13
- EasyProcess==0.3
14
- Fiona==1.8.6
15
- GitPython==3.1.26
16
- JPype1==0.7.2
17
- Jinja2==2.11.2
18
- LunarCalendar>=0.0.9
19
- Mako==1.0.7
20
- Markdown==3.3.6
21
- MarkupSafe==2.1.1
22
- Pillow==9.1.0
23
- PyMeeus==0.5.10
24
- PyQt5-sip==12.8.1
25
- PySocks==1.7.1
26
- PyVirtualDisplay==1.3.2
27
- PyWavelets==1.1.1
28
- Pygments==2.11.2
29
- PythonWebHDFS==0.2.3
30
- QtPy==1.9.0
31
- Shapely==1.7.0
32
- SoundFile==0.10.3.post1
33
- Sphinx==4.4.0
34
- #Werkzeug==2.0.3
35
- =======
36
6
#pysocks==1.7.1
37
7
#soundfile==0.10.3.post1
38
8
#werkzeug==2.0.3
39
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
40
9
adanet==0.9.0
41
10
aiohttp==3.8.0
42
11
aiozmq==0.9.0
@@ -62,10 +31,6 @@ botocore==1.12.253
62
31
branca==0.4.0
63
32
catboost==0.22
64
33
category-encoders==2.0.0
65
- <<<<<<< HEAD
66
- #certifi==2021.10.8
67
- =======
68
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
69
34
certipy==0.1.2
70
35
chardet==3.0.4
71
36
click-plugins==1.1.1
@@ -86,10 +51,7 @@ docopt==0.6.0
86
51
dopamine_rl==3.0.1
87
52
dtreeviz==0.8.1
88
53
easydict==1.9
89
- <<<<<<< HEAD
90
- =======
91
54
easyprocess==0.3
92
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
93
55
ecos==2.0.7.post1
94
56
elegy==0.1.5
95
57
enum34==1.1.8
@@ -98,27 +60,17 @@ factor-analyzer
98
60
fastavro==0.21.4
99
61
fasteners==0.15
100
62
featuretools==0.9.1
101
- <<<<<<< HEAD
102
- fire==0.3.1
103
- flake8==4.0.0
104
- folium==0.10.0
105
- fonttools==4.32.0
106
- =======
107
63
fiona==1.8.6
108
64
fire==0.3.1
109
65
flake8==3.8.4
110
66
folium==0.10.0
111
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
112
67
funcy==1.13
113
68
gast==0.5.0
114
69
gensim==3.8.0
115
70
geopandas==0.5.1
116
71
gin_config==0.3.0
117
72
gitdb==4.0.5
118
- <<<<<<< HEAD
119
- =======
120
73
gitpython==3.1.26
121
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
122
74
google-api-core[grpc]==1.23.0
123
75
google-images-download==2.8.0
124
76
google-pasta==0.1.8
@@ -134,23 +86,12 @@ holidays>=0.11.3.1
134
86
hyperopt==0.1.2
135
87
imageio==2.8.0
136
88
imbalanced-learn==0.5.0
137
- <<<<<<< HEAD
138
- importlib_resources==5.7.1
139
- ipyparallel==6.2.4
140
- ipywidgets==7.5.1
141
- isort==4.3.21
142
- jedi==0.17.2
143
- jmespath==0.9.4
144
- json-tricks==3.14.0
145
- #jsonschema==4.4.0
146
- =======
147
89
ipyparallel==6.2.4
148
90
ipywidgets==7.5.1
149
91
isort==4.3.21
150
92
jmespath==0.9.4
151
93
jpype1==0.7.2
152
94
json-tricks==3.14.0
153
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
154
95
jupyter-console==6.1.0
155
96
jupyter-contrib-core==0.3.3
156
97
jupyter-contrib-nbextensions==0.5.1
@@ -164,20 +105,6 @@ jupyter-server-proxy==1.2.0
164
105
jupyter==1.0.0
165
106
jupyter_bokeh==2.0.4
166
107
jupyter_client==6.1.11
167
- <<<<<<< HEAD
168
- jupyter_server==1.15.5
169
- jupyter_server_mathjax==0.2.4
170
- jupyterhub==2.2.1
171
- jupyterhub_kubespawner==0.15.0
172
- jupyterlab-git==0.36.0
173
- jupyterlab-github==2.0.0
174
- jupyterlab-lsp==3.6.0
175
- jupyterlab==3.3.0
176
- jupyterlab_hdf==0.3.0
177
- jupyterlabutils
178
- jupyterthemes==0.20.0
179
- kiwisolver==1.4.2
180
- =======
181
108
jupyter_server_mathjax==0.2.4
182
109
jupyterhub==2.2.1
183
110
jupyterhub_kubespawner==0.15.0
@@ -188,24 +115,13 @@ jupyterlab-lsp==3.6.0
188
115
jupyterlab_hdf==0.3.0
189
116
jupyterlabutils
190
117
jupyterthemes==0.20.0
191
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
192
118
konlpy==0.5.2
193
119
kss==1.3.1
194
120
kubernetes==22.6.0
195
121
lazy-object-proxy==1.4.3
196
122
lesscpy==0.14.0
197
123
lightgbm==2.3.1
198
124
lime==0.1.1.37
199
- <<<<<<< HEAD
200
- lunardate==0.2.0
201
- lxml==4.5.0
202
- marshmallow==3.14.1
203
- matplotlib==3.5.1
204
- #matplotlib_inline==0.1.3
205
- mecab-python===0.996-ko-0.9.2
206
- meshio==4.4.5
207
- mistune==0.8.3
208
- =======
209
125
lunarcalendar>=0.0.9
210
126
lunardate==0.2.0
211
127
lxml==4.5.0
@@ -215,60 +131,29 @@ marshmallow==3.14.1
215
131
matplotlib_inline==0.1.3
216
132
mecab-python===0.996-ko-0.9.2
217
133
meshio==4.4.5
218
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
219
134
mlxtend==0.17.2
220
135
mmdnn==0.3.1
221
136
mne==0.20.5
222
137
mock==3.0.5
223
138
monotonic==1.4
224
139
more-itertools==7.2.0
225
140
msgpack-python==0.5.6
226
- <<<<<<< HEAD
227
- msgpack==1.0.2
228
- =======
229
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
230
141
multidict==4.7.5
231
142
multiprocess==0.70.9
232
143
munch==2.5.0
233
144
namedlist==1.7
234
145
nbclassic==0.3.6
235
- <<<<<<< HEAD
236
- nbclient==0.5.13
237
- nbconvert==6.4.3
238
- nbdime==3.1.0
239
- nbformat==5.2.0
240
- #nest_asyncio==1.5.4
241
- networkx==2.8
242
- nltk==3.3.0
243
- nose==1.3.3
244
- notebook==6.4.10
245
- numexpr==2.7.0
246
- numpy==1.21.4
247
- =======
248
146
nbdime==3.1.0
249
147
nose==1.3.3
148
+ notebook==6.4.11
250
149
numexpr==2.7.0
251
150
numpy==1.22.3
252
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
253
151
oauth2client==3.0.0
254
152
oauthenticator==0.12.1
255
153
opencv-python==4.5.5
256
154
opencv_python_headless==4.5.5.62
257
155
opt-einsum==3.2.0
258
156
osqp==0.5.0
259
- <<<<<<< HEAD
260
- packaging==21.2
261
- pandas==1.4.2
262
- pandasgui==0.2.7
263
- pandocfilters==1.5.0
264
- pandocfilters==1.5.0
265
- partd==1.2.0
266
- path==16.2.0
267
- pathspec==0.9.0
268
- patsy==0.5.1
269
- pbr==5.5.0
270
- pexpect==4.8.0
271
- =======
272
157
pexpect==4.8.0
273
158
pandas==1.4.2
274
159
pandasgui==0.2.7
@@ -277,64 +162,29 @@ patsy==0.5.0
277
162
partd==1.2.0
278
163
path==16.2.0
279
164
pbr==5.5.0
280
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
281
165
plaidml==0.7.0
282
166
platformdirs==2.5.1
283
167
plotly==4.5.3
284
168
ply==3.11
285
- <<<<<<< HEAD
286
- portpicker==1.3.1
287
- progressbar==2.5
288
- prometheus-client==0.13.1
289
- promise==2.3
290
- prompt_toolkit==3.0.17
291
- protobuf==3.20.0
292
- =======
293
169
Pillow==9.1.0
294
170
portpicker==1.3.1
295
171
progressbar==2.5
296
172
prometheus_client==0.14.1
297
173
promise==2.3
298
174
protobuf==3.20.0
299
175
prompt_toolkit==3.0.29
300
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
301
176
psutil==5.9.0
302
177
ptyprocess==0.6.0
303
178
pulp==2.5.1
304
179
py-cpuinfo==5.0.0
305
- <<<<<<< HEAD
306
- py==1.11.0
307
- pyLDAvis==2.1.2
308
- pyaml==19.12.0
309
- pyasn1==0.4.8
310
- pyasn1_modules==0.2.8
311
- pybind11==2.4.2
312
- pycairo==1.20.1
313
- pycocotools==2.0.0
314
- pycparser==2.19
315
- pydocstyle==5.0.2
316
- =======
317
180
pyaml==19.12.0
318
181
pyasn1-modules==0.2.8
319
182
pycairo==1.20.1
320
183
pydocstyle==6.1.1
321
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
322
184
pydotplus==2.0.2
323
185
pygal==2.4.0
324
186
pygame==2.0.1
325
187
pyglet==1.5.0
326
- <<<<<<< HEAD
327
- pylint==2.13.5
328
- pyls-black==0.4.4
329
- pymongo==3.10.1
330
- pyparsing==2.4.6
331
- pyproj==2.5.0
332
- pyqt5==5.15.0
333
- pyrsistent==0.18.1
334
- pyshp==2.2.0
335
- pystan==3.3.0
336
- python-dateutil==2.8.2
337
- =======
338
188
pygments==2.11.2
339
189
pyldavis==2.1.2
340
190
pylint==2.13.5
@@ -349,18 +199,10 @@ pyrsistent==0.16.1
349
199
pyshp==2.2.0
350
200
PySocks==1.7.1
351
201
pystan==3.3.0
352
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
353
202
python-jsonrpc-server==0.4.0
354
203
python-language-server[all]==0.36.2
355
204
python-lsp-server==1.4.1
356
205
python-speech-features==0.6
357
- <<<<<<< HEAD
358
- pythran==0.11.0
359
- pyvista==0.24.3
360
- pyvo==1.0
361
- qgrid==1.3.1
362
- qtconsole==4.7.1
363
- =======
364
206
pythonwebhdfs==0.2.3
365
207
pythran==0.11.0
366
208
pyvirtualdisplay==1.3.2
@@ -370,7 +212,6 @@ pywavelets==1.1.1
370
212
qgrid==1.3.1
371
213
qtconsole==4.7.1
372
214
qtpy==1.9.0
373
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
374
215
retrying==1.3.3
375
216
rope==0.16.0
376
217
ruamel.yaml.clib==0.2.0
@@ -388,21 +229,14 @@ seaborn==0.10.0
388
229
selenium==3.141.0
389
230
sentence_transformers==2.1.0
390
231
setuptools-git==1.2
391
- <<<<<<< HEAD
392
- =======
393
232
shapely==1.7.0
394
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
395
233
simpervisor==0.3
396
234
simpleaudio==1.0.4
397
235
simplejson==3.17.0
398
236
smart-open==5.2.1
399
237
soynlp==0.0.493
400
238
statsmodels==0.11.1
401
239
stopit==1.1.2
402
- <<<<<<< HEAD
403
- tensorboard==2.8.0
404
- =======
405
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
406
240
termcolor==1.1.0
407
241
test-generator==0.1.1
408
242
transformers==4.11.3
@@ -415,10 +249,6 @@ versioneer==0.18
415
249
visdom>=0.1.8.9
416
250
vtk==9.0.1
417
251
wcwidth==0.1.8
418
- <<<<<<< HEAD
419
- webencodings==0.5.1
420
- =======
421
- >>>>>>> 6a6593ec74e88d0a437b40681438d777201cafec
422
252
widgetsnbextension==3.5.1
423
253
yapf==0.29.0
424
254
yarl==1.4.2
0 commit comments