Skip to content

Commit 1393eb2

Browse files
committed
Merge remote-tracking branch 'upstream/source' into emiliom-patch-1
2 parents 5dfa41c + 8f1c812 commit 1393eb2

2 files changed

Lines changed: 83 additions & 95 deletions

File tree

environment.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ name: ohw-site
22
channels:
33
- conda-forge
44
dependencies:
5-
- python>=3.9
5+
- python>=3.10
66
# website/blog building
7-
- myst-nb
8-
- sphinx
7+
- myst-nb>=0.16.0
8+
- sphinx>= 5.0.2
99
# - sphinx-panels
10-
- ablog>=0.10.23
11-
- sphinx-autobuild
12-
- pydata-sphinx-theme>=0.8.0
10+
- ablog>=0.10.26
11+
- sphinx-autobuild>=2021.3.14
12+
- pydata-sphinx-theme>=0.9.0
13+
- ipywidgets>=7.7.1
14+
- sphinx-design>=0.2.0
1315
# computation
14-
- numpy
15-
- pandas
16-
- xarray
17-
- ipywidgets
18-
- sphinx-design
16+
- numpy>=1.23.1
17+
- pandas>=1.4.3
18+
- xarray>=2022.3.0

requirements.txt

Lines changed: 72 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,96 @@
11
ablog==0.10.26
22
alabaster==0.7.12
3-
anyio==3.5.0
43
appnope==0.1.3
5-
argh==0.26.2
64
argon2-cffi==21.3.0
75
argon2-cffi-bindings==21.2.0
86
asttokens==2.0.5
9-
async-generator==1.10
10-
attrs==20.3.0
11-
Babel==2.9.1
7+
attrs==21.4.0
8+
Babel==2.10.3
129
backcall==0.2.0
1310
backports.functools-lru-cache==1.6.4
14-
beautifulsoup4==4.9.3
15-
bleach==4.0.0
11+
beautifulsoup4==4.11.1
12+
bleach==5.0.1
1613
brotlipy==0.7.0
1714
certifi==2022.6.15
18-
cffi==1.15.0
19-
chardet==4.0.0
20-
charset-normalizer==2.0.0
15+
cffi==1.15.1
16+
charset-normalizer==2.1.0
2117
click==8.1.3
22-
click-completion==0.5.2
23-
click-log==0.3.2
24-
colorama==0.4.4
25-
cryptography==36.0.0
18+
colorama==0.4.5
19+
cryptography==37.0.1
2620
debugpy==1.6.0
27-
decorator==5.0.9
21+
decorator==5.1.1
2822
defusedxml==0.7.1
29-
docutils==0.17.1
30-
entrypoints==0.3
23+
docutils==0.18.1
24+
entrypoints==0.4
3125
executing==0.8.3
26+
fastjsonschema==2.15.3
3227
feedgen==0.9.0
3328
flit_core==3.7.1
34-
gitdb==4.0.7
35-
GitPython==3.1.18
3629
greenlet==1.1.2
37-
idna==3.1
38-
imagesize==1.2.0
39-
importlib-metadata==4.11.3
40-
invoke==1.6.0
41-
ipykernel==6.13.0
42-
ipython==8.3.0
30+
idna==3.3
31+
imagesize==1.4.1
32+
importlib-metadata==4.11.4
33+
importlib-resources==5.8.0
34+
invoke==1.7.1
35+
ipykernel==6.15.1
36+
ipython==8.4.0
4337
ipython-genutils==0.2.0
4438
ipywidgets==7.7.1
4539
jedi==0.18.1
46-
Jinja2==3.0.1
47-
jsonschema==3.2.0
48-
jupyter-cache==0.4.3
49-
jupyter-client==6.1.12
50-
jupyter-core==4.9.2
51-
jupyter-server==1.10.2
52-
jupyter-server-mathjax==0.2.3
53-
jupyter-sphinx==0.3.2
54-
jupyterlab-widgets==1.0.0
40+
Jinja2==3.1.2
41+
jsonschema==4.6.2
42+
jupyter-cache==0.5.0
43+
jupyter-client==7.3.4
44+
jupyter-core==4.10.0
45+
jupyterlab-pygments==0.2.2
46+
jupyterlab-widgets==1.1.1
5547
livereload==2.6.3
56-
lxml==4.8.0
57-
markdown-it-py==1.1.0
48+
lxml==4.9.1
49+
markdown-it-py==2.1.0
5850
MarkupSafe==2.1.1
59-
matplotlib-inline==0.1.2
60-
mdit-py-plugins==0.2.8
51+
matplotlib-inline==0.1.3
52+
mdit-py-plugins==0.3.0
53+
mdurl==0.1.0
6154
mistune==0.8.4
62-
myst-nb==0.13.2
63-
myst-parser==0.15.2
64-
nbclient==0.5.3
65-
nbconvert==5.6.0
66-
nbdime==3.1.0
67-
nbformat==5.1.3
68-
nbsphinx==0.8.6
69-
nest-asyncio==1.5.1
55+
myst-nb==0.16.0
56+
myst-parser==0.18.0
57+
nbclient==0.5.13
58+
nbconvert==6.5.0
59+
nbformat==5.4.0
60+
nbsphinx==0.8.9
61+
nest-asyncio==1.5.5
7062
notebook==6.4.12
71-
numpy==1.22.3
72-
packaging==21.0
73-
pandas==1.4.2
74-
pandocfilters==1.4.2
75-
parso==0.8.2
63+
numpy==1.23.1
64+
packaging==21.3
65+
pandas==1.4.3
66+
pandocfilters==1.5.0
67+
parso==0.8.3
7668
pexpect==4.8.0
7769
pickleshare==0.7.5
78-
pip==21.2.3
79-
prometheus-client==0.11.0
80-
prompt-toolkit==3.0.19
81-
psutil==5.9.0
70+
pip==22.1.2
71+
prometheus-client==0.14.1
72+
prompt-toolkit==3.0.30
73+
psutil==5.9.1
8274
ptyprocess==0.7.0
8375
pure-eval==0.2.2
84-
pycparser==2.20
76+
pycparser==2.21
8577
pydata-sphinx-theme==0.9.0
86-
Pygments==2.9.0
87-
pyOpenSSL==20.0.1
88-
pyparsing==2.4.7
78+
Pygments==2.12.0
79+
pyOpenSSL==22.0.0
80+
pyparsing==3.0.9
8981
pyrsistent==0.18.1
9082
PySocks==1.7.1
9183
python-dateutil==2.8.2
92-
pytz==2021.1
84+
pytz==2022.1
9385
PyYAML==6.0
94-
pyzmq==22.3.0
95-
requests==2.26.0
96-
requests-unixsocket==0.2.0
97-
Send2Trash==1.7.1
98-
setuptools==62.1.0
99-
shellingham==1.4.0
86+
pyzmq==23.2.0
87+
requests==2.28.1
88+
Send2Trash==1.8.0
89+
setuptools==63.1.0
10090
six==1.16.0
101-
smmap==3.0.5
102-
sniffio==1.2.0
103-
snowballstemmer==2.1.0
104-
soupsieve==2.0.1
105-
Sphinx==4.5.0
91+
snowballstemmer==2.2.0
92+
soupsieve==2.3.1
93+
Sphinx==5.0.2
10694
sphinx-autobuild==2021.3.14
10795
sphinx_design==0.2.0
10896
sphinx-togglebutton==0.3.1
@@ -112,19 +100,19 @@ sphinxcontrib-htmlhelp==2.0.0
112100
sphinxcontrib-jsmath==1.0.1
113101
sphinxcontrib-qthelp==1.0.3
114102
sphinxcontrib-serializinghtml==1.1.5
115-
SQLAlchemy==1.4.36
116-
stack-data==0.2.0
117-
terminado==0.13.3
118-
testpath==0.5.0
119-
tornado==6.1
120-
traitlets==5.1.1
121-
typing-extensions==3.10.0.0
122-
urllib3==1.26.6
123-
watchdog==2.1.7
103+
SQLAlchemy==1.4.39
104+
stack-data==0.3.0
105+
tabulate==0.8.10
106+
terminado==0.15.0
107+
tinycss2==1.1.1
108+
tornado==6.2
109+
traitlets==5.3.0
110+
typing_extensions==4.3.0
111+
urllib3==1.26.10
112+
watchdog==2.1.9
124113
wcwidth==0.2.5
125114
webencodings==0.5.1
126-
websocket-client==1.3.2
127-
wheel==0.36.2
128-
widgetsnbextension==3.6.0
115+
wheel==0.37.1
116+
widgetsnbextension==3.6.1
129117
xarray==2022.3.0
130-
zipp==3.5.0
118+
zipp==3.8.0

0 commit comments

Comments
 (0)