Skip to content

Commit 00366e9

Browse files
Fix python versioning shenanigans in docker container
1 parent 1924dba commit 00366e9

File tree

8 files changed

+868
-777
lines changed

8 files changed

+868
-777
lines changed

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.11
1+
FROM python:3.12
22

33
LABEL org.opencontainers.image.source=https://github.com/AD-SDL/wei
44
LABEL org.opencontainers.image.description="The Workflow Execution Interface (WEI)"
@@ -28,6 +28,7 @@ RUN mkdir -p .diaspora
2828
COPY requirements/requirements.txt wei/requirements/requirements.txt
2929
COPY requirements/dev.txt wei/requirements/dev.txt
3030
RUN --mount=type=cache,target=/root/.cache \
31+
pip install --upgrade setuptools wheel pip && \
3132
pip install -r wei/requirements/requirements.txt
3233

3334
# Install Node Dependencies first, for caching purposes
@@ -43,7 +44,7 @@ COPY scripts wei/scripts
4344

4445
# Install dependencies and wei
4546
RUN --mount=type=cache,target=/root/.cache \
46-
pip install -e wei
47+
pip install ./wei
4748

4849
COPY wei-entrypoint.sh /wei-entrypoint.sh
4950
RUN chmod +x /wei-entrypoint.sh

pdm.lock

Lines changed: 739 additions & 659 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "ad_sdl.wei"
3-
dynamic = ["version"]
3+
version = "0.6.1"
44
description = "The Rapid Prototyping Laboratory's Workflow Execution Interface."
55
authors = [
66
{name = "Rafael Vescovi", email = "ravescovi@anl.gov"},
@@ -72,8 +72,6 @@ build-backend = "setuptools.build_meta"
7272

7373
[tool.setuptools]
7474
package-dir = {"wei" = "src/wei"}
75-
[tool.setuptools.dynamic]
76-
version = {attr = "wei.__version__"}
7775

7876
#####################
7977
# Development Tools #

requirements/dev.txt

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
11
# This file is @generated by PDM.
22
# Please do not edit it manually.
33

4-
annotated-types==0.6.0
5-
anyio==4.3.0
4+
annotated-types==0.7.0
5+
anyio==4.4.0
66
asttokens==2.4.1
77
async-timeout==4.0.3; python_full_version <= "3.11.2"
88
build==1.2.1
9-
certifi==2024.2.2
10-
cffi==1.16.0; implementation_name == "pypy" or platform_python_implementation != "PyPy"
9+
certifi==2024.7.4
10+
cffi==1.17.0; implementation_name == "pypy" or platform_python_implementation != "PyPy"
1111
cfgv==3.4.0
1212
charset-normalizer==3.3.2
1313
click==8.1.7
1414
colorama==0.4.6; sys_platform == "win32" or os_name == "nt" or platform_system == "Windows"
15-
cryptography==42.0.5
15+
cryptography==43.0.0
1616
devtools==0.12.2
1717
distlib==0.3.8
18-
exceptiongroup==1.2.1; python_version < "3.11"
18+
exceptiongroup==1.2.2; python_version < "3.11"
1919
executing==2.0.1
20-
fastapi==0.110.2
21-
filelock==3.14.0
20+
fastapi==0.112.1
21+
filelock==3.15.4
2222
h11==0.14.0
2323
httptools==0.6.1
24-
identify==2.5.36
24+
identify==2.6.0
2525
idna==3.7
26-
importlib-metadata==7.1.0; python_full_version < "3.10.2"
26+
importlib-metadata==8.4.0; python_full_version < "3.10.2"
2727
iniconfig==2.0.0
2828
mmh3==4.1.0
29-
mypy==1.10.0
29+
mypy==1.11.1
3030
mypy-extensions==1.0.0
31-
nodeenv==1.8.0
32-
packaging==24.0
33-
platformdirs==4.2.1
31+
nodeenv==1.9.1
32+
packaging==24.1
33+
platformdirs==4.2.2
3434
pluggy==1.5.0
3535
pottery==3.0.0
3636
pre-commit==3.5.0
3737
pycparser==2.22; implementation_name == "pypy" or platform_python_implementation != "PyPy"
38-
pydantic==2.7.1
39-
pydantic-core==2.18.2
40-
pygments==2.17.2
38+
pydantic==2.8.2
39+
pydantic-core==2.20.1
40+
pygments==2.18.0
4141
pyproject-hooks==1.1.0
42-
pytest==8.2.0
42+
pytest==8.3.2
4343
python-dotenv==1.0.1
4444
python-multipart==0.0.9
45-
pyyaml==6.0.1
45+
pyyaml==6.0.2
4646
redis==4.6.0
47-
requests==2.31.0
48-
ruff==0.4.2
47+
requests==2.32.3
48+
ruff==0.6.1
4949
secure-smtplib==0.1.1
50-
setuptools==69.5.1
5150
six==1.16.0
5251
sniffio==1.3.1
53-
starlette==0.37.2
52+
starlette==0.38.2
5453
tomli==2.0.1; python_version < "3.11"
55-
types-aiofiles==23.2.0.20240403
54+
types-aiofiles==24.1.0.20240626
5655
types-cffi==1.16.0.20240331
5756
types-cryptography==3.3.23.2
5857
types-jwt==0.1.3
5958
types-orjson==3.6.2
60-
types-pyopenssl==24.1.0.20240425
61-
types-python-dateutil==2.9.0.20240316
62-
types-pyyaml==6.0.12.20240311
63-
types-redis==4.6.0.20240425
59+
types-pyopenssl==24.1.0.20240722
60+
types-python-dateutil==2.9.0.20240821
61+
types-pyyaml==6.0.12.20240808
62+
types-redis==4.6.0.20240819
6463
types-requests==2.31.0.6
65-
types-setuptools==69.5.0.20240423
66-
types-ujson==5.9.0.0
64+
types-setuptools==73.0.0.20240822
65+
types-ujson==5.10.0.20240515
6766
types-urllib3==1.26.25.14
68-
typing-extensions==4.11.0
67+
typing-extensions==4.12.2
6968
ulid-py==1.1.0
70-
urllib3==1.26.18
71-
uvicorn==0.29.0
72-
uvloop==0.19.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy"
73-
virtualenv==20.26.1
74-
watchfiles==0.21.0
75-
websockets==12.0
76-
zipp==3.18.1; python_full_version < "3.10.2"
69+
urllib3==1.26.19
70+
uvicorn==0.30.6
71+
uvicorn[standard]==0.30.6
72+
uvloop==0.20.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy"
73+
virtualenv==20.26.3
74+
watchfiles==0.23.0
75+
websockets==13.0
76+
zipp==3.20.0; python_full_version < "3.10.2"

requirements/docs.txt

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,41 @@
22
# Please do not edit it manually.
33

44
alabaster==0.7.13
5-
annotated-types==0.6.0
6-
anyio==4.3.0
5+
annotated-types==0.7.0
6+
anyio==4.4.0
77
asttokens==2.4.1
88
async-timeout==4.0.3; python_full_version <= "3.11.2"
99
autodoc-pydantic==2.2.0
10-
babel==2.14.0
11-
certifi==2024.2.2
10+
babel==2.16.0
11+
certifi==2024.7.4
1212
charset-normalizer==3.3.2
1313
click==8.1.7
1414
colorama==0.4.6; sys_platform == "win32" or os_name == "nt" or platform_system == "Windows"
1515
devtools==0.12.2
1616
docutils==0.20.1
17-
exceptiongroup==1.2.1; python_version < "3.11"
17+
exceptiongroup==1.2.2; python_version < "3.11"
1818
executing==2.0.1
19-
fastapi==0.110.2
19+
fastapi==0.112.1
2020
h11==0.14.0
2121
httptools==0.6.1
2222
idna==3.7
2323
imagesize==1.4.1
24-
importlib-metadata==7.1.0; python_full_version < "3.10.2"
25-
jinja2==3.1.3
24+
importlib-metadata==8.4.0; python_full_version < "3.10.2"
25+
jinja2==3.1.4
2626
markupsafe==2.1.5
2727
mmh3==4.1.0
28-
packaging==24.0
28+
packaging==24.1
2929
pottery==3.0.0
30-
pydantic==2.7.1
31-
pydantic-core==2.18.2
32-
pydantic-settings==2.2.1
33-
pygments==2.17.2
30+
pydantic==2.8.2
31+
pydantic-core==2.20.1
32+
pydantic-settings==2.4.0
33+
pygments==2.18.0
3434
python-dotenv==1.0.1
3535
python-multipart==0.0.9
3636
pytz==2024.1; python_version < "3.9"
37-
pyyaml==6.0.1
37+
pyyaml==6.0.2
3838
redis==4.6.0
39-
requests==2.31.0
39+
requests==2.32.3
4040
secure-smtplib==0.1.1
4141
six==1.16.0
4242
sniffio==1.3.1
@@ -50,12 +50,13 @@ sphinxcontrib-jquery==4.1
5050
sphinxcontrib-jsmath==1.0.1
5151
sphinxcontrib-qthelp==1.0.3
5252
sphinxcontrib-serializinghtml==1.1.5
53-
starlette==0.37.2
54-
typing-extensions==4.11.0
53+
starlette==0.38.2
54+
typing-extensions==4.12.2
5555
ulid-py==1.1.0
56-
urllib3==1.26.18
57-
uvicorn==0.29.0
58-
uvloop==0.19.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy"
59-
watchfiles==0.21.0
60-
websockets==12.0
61-
zipp==3.18.1; python_full_version < "3.10.2"
56+
urllib3==1.26.19
57+
uvicorn==0.30.6
58+
uvicorn[standard]==0.30.6
59+
uvloop==0.20.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy"
60+
watchfiles==0.23.0
61+
websockets==13.0
62+
zipp==3.20.0; python_full_version < "3.10.2"

requirements/requirements.txt

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,67 +2,68 @@
22
# Please do not edit it manually.
33

44
alabaster==0.7.13
5-
annotated-types==0.6.0
6-
anyio==4.3.0
5+
annotated-types==0.7.0
6+
anyio==4.4.0
77
asttokens==2.4.1
88
async-timeout==4.0.3; python_full_version <= "3.11.2"
99
autodoc-pydantic==2.2.0
10-
babel==2.14.0
10+
babel==2.16.0
1111
build==1.2.1
12-
certifi==2024.2.2
13-
cffi==1.16.0; implementation_name == "pypy" or platform_python_implementation != "PyPy"
12+
certifi==2024.7.4
13+
cffi==1.17.0; implementation_name == "pypy" or platform_python_implementation != "PyPy"
1414
cfgv==3.4.0
1515
charset-normalizer==3.3.2
1616
click==8.1.7
1717
colorama==0.4.6; sys_platform == "win32" or os_name == "nt" or platform_system == "Windows"
18-
cryptography==42.0.5
18+
cryptography==43.0.0
1919
devtools==0.12.2
2020
diaspora-event-sdk==0.3.2
21+
diaspora-event-sdk[kafka-python]==0.3.2
2122
distlib==0.3.8
2223
docutils==0.20.1
23-
exceptiongroup==1.2.1; python_version < "3.11"
24+
exceptiongroup==1.2.2; python_version < "3.11"
2425
executing==2.0.1
25-
fastapi==0.110.2
26-
filelock==3.14.0
27-
globus-sdk==3.41.0
26+
fastapi==0.112.1
27+
filelock==3.15.4
28+
globus-sdk==3.44.0
2829
h11==0.14.0
2930
httptools==0.6.1
30-
identify==2.5.36
31+
identify==2.6.0
3132
idna==3.7
3233
imagesize==1.4.1
33-
importlib-metadata==7.1.0; python_full_version < "3.10.2"
34-
importlib-resources==6.4.0; python_version < "3.9"
34+
importlib-metadata==8.4.0; python_full_version < "3.10.2"
35+
importlib-resources==6.4.4; python_version < "3.9"
3536
iniconfig==2.0.0
36-
jinja2==3.1.3
37+
jinja2==3.1.4
3738
kafka-python==2.0.2
3839
markupsafe==2.1.5
3940
mmh3==4.1.0
40-
mypy==1.10.0
41+
mypy==1.11.1
4142
mypy-extensions==1.0.0
42-
nodeenv==1.8.0
43-
packaging==24.0
44-
platformdirs==4.2.1
43+
nodeenv==1.9.1
44+
packaging==24.1
45+
platformdirs==4.2.2
4546
pluggy==1.5.0
4647
pottery==3.0.0
4748
pre-commit==3.5.0
4849
pycparser==2.22; implementation_name == "pypy" or platform_python_implementation != "PyPy"
49-
pydantic==2.7.1
50-
pydantic-core==2.18.2
51-
pydantic-settings==2.2.1
52-
pygments==2.17.2
53-
pyjwt==2.8.0
50+
pydantic==2.8.2
51+
pydantic-core==2.20.1
52+
pydantic-settings==2.4.0
53+
pygments==2.18.0
54+
pyjwt==2.9.0
55+
pyjwt[crypto]==2.9.0
5456
pyproject-hooks==1.1.0
55-
pytest==8.2.0
57+
pytest==8.3.2
5658
python-dotenv==1.0.1
5759
python-multipart==0.0.9
5860
pytz==2024.1; python_version < "3.9"
59-
pyyaml==6.0.1
60-
pyzmq==26.0.2
61+
pyyaml==6.0.2
62+
pyzmq==26.2.0
6163
redis==4.6.0
62-
requests==2.31.0
63-
ruff==0.4.2
64+
requests==2.32.3
65+
ruff==0.6.1
6466
secure-smtplib==0.1.1
65-
setuptools==69.5.1
6667
six==1.16.0
6768
sniffio==1.3.1
6869
snowballstemmer==2.2.0
@@ -75,27 +76,28 @@ sphinxcontrib-jquery==4.1
7576
sphinxcontrib-jsmath==1.0.1
7677
sphinxcontrib-qthelp==1.0.3
7778
sphinxcontrib-serializinghtml==1.1.5
78-
starlette==0.37.2
79+
starlette==0.38.2
7980
tomli==2.0.1; python_version < "3.11"
80-
types-aiofiles==23.2.0.20240403
81+
types-aiofiles==24.1.0.20240626
8182
types-cffi==1.16.0.20240331
8283
types-cryptography==3.3.23.2
8384
types-jwt==0.1.3
8485
types-orjson==3.6.2
85-
types-pyopenssl==24.1.0.20240425
86-
types-python-dateutil==2.9.0.20240316
87-
types-pyyaml==6.0.12.20240311
88-
types-redis==4.6.0.20240425
86+
types-pyopenssl==24.1.0.20240722
87+
types-python-dateutil==2.9.0.20240821
88+
types-pyyaml==6.0.12.20240808
89+
types-redis==4.6.0.20240819
8990
types-requests==2.31.0.6
90-
types-setuptools==69.5.0.20240423
91-
types-ujson==5.9.0.0
91+
types-setuptools==73.0.0.20240822
92+
types-ujson==5.10.0.20240515
9293
types-urllib3==1.26.25.14
93-
typing-extensions==4.11.0
94+
typing-extensions==4.12.2
9495
ulid-py==1.1.0
95-
urllib3==1.26.18
96-
uvicorn==0.29.0
97-
uvloop==0.19.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy"
98-
virtualenv==20.26.1
99-
watchfiles==0.21.0
100-
websockets==12.0
101-
zipp==3.18.1; python_full_version < "3.10.2"
96+
urllib3==1.26.19
97+
uvicorn==0.30.6
98+
uvicorn[standard]==0.30.6
99+
uvloop==0.20.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy"
100+
virtualenv==20.26.3
101+
watchfiles==0.23.0
102+
websockets==13.0
103+
zipp==3.20.0; python_full_version < "3.10.2"

0 commit comments

Comments
 (0)