Skip to content

Commit cd2637a

Browse files
committed
Merge branch 'development' of github.com:PASTAplus/ezEML into development
2 parents 26ec17e + c5fc407 commit cd2637a

3 files changed

Lines changed: 50 additions & 94 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ venv.bak/
114114
webapp/config.py
115115
tests
116116
user-data
117-
home/templates/_config.html
117+
webapp/auth/templates/_config.html
118118
ezeml/templates/
119119
**/ezeml-290315-ce4543f85534.json
120120
webapp/static/unitsWithQUDTInfo.csv

environment.yml

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ dependencies:
1616
- ca-certificates=2026.2.25
1717
- certifi=2026.2.25
1818
- cffi=2.0.0
19-
- charset-normalizer=3.4.6
20-
- click=8.3.1
19+
- charset-normalizer=3.4.7
20+
- click=8.3.2
2121
- colorama=0.4.6
22-
- cryptography=46.0.5
22+
- cryptography=46.0.7
2323
- daiquiri=3.0.0
2424
- dnspython=2.8.0
2525
- dominate=2.9.1
@@ -34,9 +34,9 @@ dependencies:
3434
- flask-sqlalchemy=3.1.1
3535
- flask-wtf=1.2.2
3636
- frozenlist=1.7.0
37-
- google-auth=2.49.1
37+
- google-auth=2.49.2
3838
- google-auth-oauthlib=1.3.1
39-
- greenlet=3.3.2
39+
- greenlet=3.4.0
4040
- gspread=5.12.4
4141
- h2=4.3.0
4242
- hpack=4.1.0
@@ -48,39 +48,35 @@ dependencies:
4848
- itsdangerous=2.2.0
4949
- jansson=2.15.0
5050
- jinja2=3.1.6
51-
- ld_impl_linux-64=2.45.1
5251
- libblas=3.11.0
5352
- libcblas=3.11.0
53+
- libcxx=22.1.3
5454
- libexpat=2.7.5
5555
- libffi=3.5.2
5656
- libgcc=15.2.0
57-
- libgcc-ng=15.2.0
5857
- libgfortran=15.2.0
5958
- libgfortran5=15.2.0
60-
- libgomp=15.2.0
6159
- libiconv=1.18
6260
- liblapack=3.11.0
63-
- liblzma=5.8.2
64-
- libnsl=2.0.1
61+
- liblzma=5.8.3
6562
- libopenblas=0.3.32
66-
- libsqlite=3.52.0
67-
- libstdcxx=15.2.0
68-
- libuuid=2.42
63+
- libsqlite=3.53.0
6964
- libxcrypt=4.4.36
7065
- libxml2=2.15.2
7166
- libxml2-16=2.15.2
7267
- libxslt=1.1.43
7368
- libzlib=1.3.2
74-
- lxml=6.0.2
75-
- mako=1.3.10
69+
- llvm-openmp=22.1.3
70+
- lxml=6.0.4
71+
- mako=1.3.11
7672
- markupsafe=3.0.3
7773
- multidict=6.7.1
7874
- ncurses=6.5
7975
- numpy=2.4.3
8076
- oauthlib=3.3.1
8177
- openpyxl=3.1.5
82-
- openssl=3.6.1
83-
- packaging=26.0
78+
- openssl=3.6.2
79+
- packaging=26.1
8480
- pandas=3.0.2
8581
- pcre2=10.47
8682
- pendulum=3.2.0
@@ -96,7 +92,7 @@ dependencies:
9692
- pympler=1.1
9793
- pyopenssl=26.0.0
9894
- pysocks=1.7.1
99-
- pytest=9.0.2
95+
- pytest=9.0.3
10096
- python=3.11.15
10197
- python-dateutil=2.9.0.post0
10298
- python-json-logger=2.0.7
@@ -111,7 +107,7 @@ dependencies:
111107
- setuptools=82.0.1
112108
- six=1.17.0
113109
- sniffio=1.3.1
114-
- sqlalchemy=2.0.48
110+
- sqlalchemy=2.0.49
115111
- time-machine=2.19.0
116112
- tk=8.6.13
117113
- tomli=2.4.1
@@ -121,14 +117,14 @@ dependencies:
121117
- urllib3=2.6.3
122118
- uwsgi=2.0.31
123119
- visitor=0.1.3
124-
- werkzeug=3.1.7
120+
- werkzeug=3.1.8
125121
- wheel=0.46.3
126122
- wtforms=3.2.1
127123
- yaml=0.2.5
128124
- yarl=1.23.0
129-
- zipp=3.23.0
125+
- zipp=3.23.1
130126
- zstd=1.5.7
131127
- pip:
132128
- emlvp==1.3.0
133129
- metapype==0.3.0
134-
prefix: /home/servilla/miniconda3/envs/ezeml
130+
prefix: /opt/miniconda3/envs/ezeml

requirements.txt

Lines changed: 31 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,70 @@
1-
_openmp_mutex==4.5
21
aiohappyeyeballs==2.6.1
32
aiohttp==3.13.5
43
aiosignal==1.4.0
54
alembic==1.18.4
65
attrs==26.1.0
76
backports.zstd==1.3.0
87
blinker==1.9.0
9-
brotli-python==1.2.0
10-
bzip2==1.0.8
11-
ca-certificates==2026.2.25
8+
Brotli==1.2.0
129
certifi==2026.2.25
1310
cffi==2.0.0
14-
charset-normalizer==3.4.6
15-
click==8.3.1
11+
charset-normalizer==3.4.7
12+
click==8.3.2
1613
colorama==0.4.6
17-
cryptography==46.0.5
14+
cryptography==46.0.7
1815
daiquiri==3.0.0
1916
dnspython==2.8.0
2017
dominate==2.9.1
2118
email-validator==2.3.0
22-
email_validator==2.3.0
23-
emlvp==1.3.0
19+
EMLvp==1.3.0
2420
et_xmlfile==2.0.0
2521
exceptiongroup==1.3.1
26-
flask==3.1.3
27-
flask-bootstrap==3.3.7.1
28-
flask-login==0.6.3
29-
flask-migrate==4.1.0
30-
flask-sqlalchemy==3.1.1
31-
flask-wtf==1.2.2
22+
Flask==3.1.3
23+
Flask-Bootstrap==3.3.7.1
24+
Flask-Login==0.6.3
25+
Flask-Migrate==4.1.0
26+
Flask-SQLAlchemy==3.1.1
27+
Flask-WTF==1.2.2
3228
frozenlist==1.7.0
33-
google-auth==2.49.1
29+
google-auth==2.49.2
3430
google-auth-oauthlib==1.3.1
35-
greenlet==3.3.2
31+
greenlet==3.4.0
3632
gspread==5.12.4
3733
h2==4.3.0
3834
hpack==4.1.0
3935
hyperframe==6.1.0
40-
icu==78.3
4136
idna==3.11
42-
importlib-metadata==8.8.0
37+
importlib_metadata==8.8.0
4338
iniconfig==2.3.0
4439
itsdangerous==2.2.0
45-
jansson==2.15.0
46-
jinja2==3.1.6
47-
ld_impl_linux-64==2.45.1
48-
libblas==3.11.0
49-
libcblas==3.11.0
50-
libexpat==2.7.5
51-
libffi==3.5.2
52-
libgcc==15.2.0
53-
libgcc-ng==15.2.0
54-
libgfortran==15.2.0
55-
libgfortran5==15.2.0
56-
libgomp==15.2.0
57-
libiconv==1.18
58-
liblapack==3.11.0
59-
liblzma==5.8.2
60-
libnsl==2.0.1
61-
libopenblas==0.3.32
62-
libsqlite==3.52.0
63-
libstdcxx==15.2.0
64-
libuuid==2.42
65-
libxcrypt==4.4.36
66-
libxml2==2.15.2
67-
libxml2-16==2.15.2
68-
libxslt==1.1.43
69-
libzlib==1.3.2
70-
lxml==6.0.2
71-
mako==1.3.10
72-
markupsafe==3.0.3
40+
Jinja2==3.1.6
41+
lxml==6.0.4
42+
Mako==1.3.11
43+
MarkupSafe==3.0.3
7344
metapype==0.3.0
7445
multidict==6.7.1
75-
ncurses==6.5
7646
numpy==2.4.3
7747
oauthlib==3.3.1
7848
openpyxl==3.1.5
79-
openssl==3.6.1
80-
packaging==26.0
49+
packaging==26.1
8150
pandas==3.0.2
82-
pcre2==10.47
8351
pendulum==3.2.0
8452
pip==26.0.1
8553
pluggy==1.6.0
8654
propcache==0.3.1
8755
psutil==7.2.2
8856
pyasn1==0.6.3
89-
pyasn1-modules==0.4.2
57+
pyasn1_modules==0.4.2
9058
pycparser==2.22
91-
pygments==2.20.0
92-
pyjwt==2.12.1
93-
pympler==1.1
94-
pyopenssl==26.0.0
95-
pysocks==1.7.1
96-
pytest==9.0.2
97-
python==3.11.15
59+
Pygments==2.20.0
60+
PyJWT==2.12.1
61+
Pympler==1.1
62+
pyOpenSSL==26.0.0
63+
PySocks==1.7.1
64+
pytest==9.0.3
9865
python-dateutil==2.9.0.post0
9966
python-json-logger==2.0.7
100-
python_abi==3.11
10167
pyu2f==0.1.5
102-
readline==8.3
10368
requests==2.33.1
10469
requests-file==3.0.1
10570
requests-oauthlib==2.0.0
@@ -108,20 +73,15 @@ rsa==4.9.1
10873
setuptools==82.0.1
10974
six==1.17.0
11075
sniffio==1.3.1
111-
sqlalchemy==2.0.48
76+
SQLAlchemy==2.0.49
11277
time-machine==2.19.0
113-
tk==8.6.13
11478
tomli==2.4.1
115-
typing-extensions==4.15.0
11679
typing_extensions==4.15.0
117-
tzdata==2025c
11880
urllib3==2.6.3
119-
uwsgi==2.0.31
81+
uWSGI==2.0.31
12082
visitor==0.1.3
121-
werkzeug==3.1.7
83+
Werkzeug==3.1.8
12284
wheel==0.46.3
123-
wtforms==3.2.1
124-
yaml==0.2.5
85+
WTForms==3.2.1
12586
yarl==1.23.0
126-
zipp==3.23.0
127-
zstd==1.5.7
87+
zipp==3.23.1

0 commit comments

Comments
 (0)