Skip to content

Commit

Permalink
updating pdm lock
Browse files Browse the repository at this point in the history
  • Loading branch information
tginsbu1 committed Oct 21, 2024
2 parents 9f745cc + 969f5b8 commit e852254
Show file tree
Hide file tree
Showing 10 changed files with 554 additions and 387 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ jobs:
steps:
- uses: actions/checkout@v3
name: Checkout code
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
name: Setup Python
with:
python-version: 3.12
- uses: pre-commit/[email protected]
name: Run Pre-Commit Checks
6 changes: 3 additions & 3 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
steps:
- uses: actions/checkout@v3
name: Checkout code
- name: Set up Python 3.9
- name: Set up Python 3.12
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.12
- name: Setup PDM
uses: pdm-project/setup-pdm@v3
with:
python-version: 3.9
python-version: 3.12
- name: Install dependencies
run: pdm install
- name: Publish to PyPi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
with:
python-version: 3.12
- name: Test with pytest
run: make test
run: make init build test
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ COPY requirements/requirements.txt wei/requirements/requirements.txt
COPY requirements/dev.txt wei/requirements/dev.txt
RUN --mount=type=cache,target=/root/.cache \
pip install --upgrade setuptools wheel pip && \
pip install -r wei/requirements/requirements.txt
pip install -r wei/requirements/requirements.txt && \
pip install -r wei/requirements/dev.txt

ENV PATH="${PATH}:~/.local/bin"

# Copy rest of wei files
COPY src wei/src
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ checks: # Runs all the pre-commit checks
@pre-commit run --all-files || { echo "Checking fixes\n" ; pre-commit run --all-files; }

test: init .env build up # Runs all the tests
@docker compose run test_wei_server pytest -p no:cacheprovider wei
@docker compose exec test_wei_server pytest -p no:cacheprovider wei
@#docker compose down

down:
Expand Down
775 changes: 460 additions & 315 deletions pdm.lock

Large diffs are not rendered by default.

49 changes: 27 additions & 22 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,74 +3,79 @@

aenum==3.1.15
annotated-types==0.7.0
anyio==4.6.0
anyio==4.6.2.post1
asttokens==2.4.1
build==1.2.2
async-timeout==4.0.3; python_full_version <= "3.11.2"
build==1.2.2.post1
certifi==2024.8.30
cffi==1.17.1; platform_python_implementation != "PyPy"
cffi==1.17.1; implementation_name == "pypy" or platform_python_implementation != "PyPy"
cfgv==3.4.0
charset-normalizer==3.3.2
charset-normalizer==3.4.0
click==8.1.7
colorama==0.4.6
cryptography==43.0.1
cryptography==43.0.3
devtools==0.12.2
distlib==0.3.8
distlib==0.3.9
exceptiongroup==1.2.2; python_version < "3.11"
executing==2.1.0
fastapi==0.115.0
fastapi==0.115.2
filelock==3.16.1
h11==0.14.0
httptools==0.6.1
httptools==0.6.4
identify==2.6.1
idna==3.10
importlib-metadata==8.5.0; python_full_version < "3.10.2"
iniconfig==2.0.0
markdown-it-py==3.0.0
mdurl==0.1.2
mmh3==5.0.1
mypy==1.11.2
mypy==1.12.1
mypy-extensions==1.0.0
nodeenv==1.9.1
packaging==24.1
pause==0.3
platformdirs==4.3.6
pluggy==1.5.0
pottery==3.0.0
pre-commit==3.8.0
pycparser==2.22; platform_python_implementation != "PyPy"
pre-commit==4.0.1
pycparser==2.22; implementation_name == "pypy" or platform_python_implementation != "PyPy"
pydantic==2.9.2
pydantic-core==2.23.4
pydantic-extra-types==2.9.0
pygments==2.18.0
pyproject-hooks==1.1.0
pyproject-hooks==1.2.0
pytest==8.3.3
python-dotenv==1.0.1
python-multipart==0.0.10
python-ulid==2.7.0
python-multipart==0.0.12
python-ulid[pydantic]==3.0.0
pyyaml==6.0.2
redis==4.6.0
requests==2.32.3
rich==13.9.2
ruff==0.6.7
ruff==0.7.0
secure-smtplib==0.1.1
six==1.16.0
sniffio==1.3.1
starlette==0.38.6
starlette==0.40.0
tomli==2.0.2; python_version < "3.11"
types-aiofiles==24.1.0.20240626
types-cffi==1.16.0.20240331
types-cryptography==3.3.23.2
types-jwt==0.1.3
types-orjson==3.6.2
types-pyopenssl==24.1.0.20240722
types-python-dateutil==2.9.0.20240906
types-python-dateutil==2.9.0.20241003
types-pyyaml==6.0.12.20240917
types-redis==4.6.0.20240903
types-redis==4.6.0.20241004
types-requests==2.31.0.6
types-setuptools==75.1.0.20240917
types-setuptools==75.2.0.20241019
types-ujson==5.10.0.20240515
types-urllib3==1.26.25.14
typing-extensions==4.12.2
urllib3==1.26.20
uvicorn==0.30.6
uvloop==0.20.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy"
virtualenv==20.26.5
uvicorn[standard]==0.32.0
uvloop==0.21.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy"
virtualenv==20.27.0
watchfiles==0.24.0
websockets==13.1
zipp==3.20.2; python_full_version < "3.10.2"
31 changes: 18 additions & 13 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,28 @@
aenum==3.1.15
alabaster==0.7.16
annotated-types==0.7.0
anyio==4.6.0
anyio==4.6.2.post1
asttokens==2.4.1
async-timeout==4.0.3; python_full_version <= "3.11.2"
autodoc-pydantic==2.2.0
babel==2.16.0
certifi==2024.8.30
charset-normalizer==3.3.2
charset-normalizer==3.4.0
click==8.1.7
colorama==0.4.6
devtools==0.12.2
docutils==0.20.1
docutils==0.21.2
exceptiongroup==1.2.2; python_version < "3.11"
executing==2.1.0
fastapi==0.115.0
fastapi==0.115.2
h11==0.14.0
httptools==0.6.1
httptools==0.6.4
idna==3.10
imagesize==1.4.1
importlib-metadata==8.5.0; python_full_version < "3.10.2"
jinja2==3.1.4
markdown-it-py==3.0.0
markupsafe==2.1.5
markupsafe==3.0.2
mdurl==0.1.2
mmh3==5.0.1
packaging==24.1
Expand All @@ -31,11 +34,11 @@ pottery==3.0.0
pydantic==2.9.2
pydantic-core==2.23.4
pydantic-extra-types==2.9.0
pydantic-settings==2.5.2
pydantic-settings==2.6.0
pygments==2.18.0
python-dotenv==1.0.1
python-multipart==0.0.10
python-ulid==2.7.0
python-multipart==0.0.12
python-ulid[pydantic]==3.0.0
pyyaml==6.0.2
redis==4.6.0
requests==2.32.3
Expand All @@ -45,18 +48,20 @@ six==1.16.0
sniffio==1.3.1
snowballstemmer==2.2.0
sphinx==7.4.7
sphinx-rtd-theme==2.0.0
sphinx-rtd-theme==3.0.1
sphinxcontrib-applehelp==2.0.0
sphinxcontrib-devhelp==2.0.0
sphinxcontrib-htmlhelp==2.1.0
sphinxcontrib-jquery==4.1
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==2.0.0
sphinxcontrib-serializinghtml==2.0.0
starlette==0.38.6
starlette==0.40.0
tomli==2.0.2; python_version < "3.11"
typing-extensions==4.12.2
urllib3==1.26.20
uvicorn==0.30.6
uvloop==0.20.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy"
uvicorn[standard]==0.32.0
uvloop==0.21.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy"
watchfiles==0.24.0
websockets==13.1
zipp==3.20.2; python_full_version < "3.10.2"
63 changes: 34 additions & 29 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,96 +4,101 @@
aenum==3.1.15
alabaster==0.7.16
annotated-types==0.7.0
anyio==4.6.0
anyio==4.6.2.post1
asttokens==2.4.1
async-timeout==4.0.3; python_full_version <= "3.11.2"
autodoc-pydantic==2.2.0
babel==2.16.0
build==1.2.2
build==1.2.2.post1
certifi==2024.8.30
cffi==1.17.1; platform_python_implementation != "PyPy"
cffi==1.17.1; implementation_name == "pypy" or platform_python_implementation != "PyPy"
cfgv==3.4.0
charset-normalizer==3.3.2
charset-normalizer==3.4.0
click==8.1.7
colorama==0.4.6
cryptography==43.0.1
cryptography==43.0.3
devtools==0.12.2
diaspora-event-sdk==0.3.6
distlib==0.3.8
docutils==0.20.1
diaspora-event-sdk[kafka-python]==0.3.7
distlib==0.3.9
docutils==0.21.2
exceptiongroup==1.2.2; python_version < "3.11"
executing==2.1.0
fastapi==0.115.0
fastapi==0.115.2
filelock==3.16.1
globus-sdk==3.45.0
globus-sdk==3.46.0
h11==0.14.0
httptools==0.6.1
httptools==0.6.4
identify==2.6.1
idna==3.10
imagesize==1.4.1
importlib-metadata==8.5.0; python_full_version < "3.10.2"
iniconfig==2.0.0
jinja2==3.1.4
kafka-python==2.0.2
markdown-it-py==3.0.0
markupsafe==2.1.5
markupsafe==3.0.2
mdurl==0.1.2
mmh3==5.0.1
mypy==1.11.2
mypy==1.12.1
mypy-extensions==1.0.0
nodeenv==1.9.1
packaging==24.1
pause==0.3
platformdirs==4.3.6
pluggy==1.5.0
pottery==3.0.0
pre-commit==3.8.0
pycparser==2.22; platform_python_implementation != "PyPy"
pre-commit==4.0.1
pycparser==2.22; implementation_name == "pypy" or platform_python_implementation != "PyPy"
pydantic==2.9.2
pydantic-core==2.23.4
pydantic-extra-types==2.9.0
pydantic-settings==2.5.2
pydantic-settings==2.6.0
pygments==2.18.0
pyjwt==2.9.0
pyproject-hooks==1.1.0
pyjwt[crypto]==2.9.0
pyproject-hooks==1.2.0
pytest==8.3.3
python-dotenv==1.0.1
python-multipart==0.0.10
python-ulid==2.7.0
python-multipart==0.0.12
python-ulid[pydantic]==3.0.0
pyyaml==6.0.2
pyzmq==26.2.0
redis==4.6.0
requests==2.32.3
rich==13.9.2
ruff==0.6.7
ruff==0.7.0
secure-smtplib==0.1.1
six==1.16.0
sniffio==1.3.1
snowballstemmer==2.2.0
sphinx==7.4.7
sphinx-rtd-theme==2.0.0
sphinx-rtd-theme==3.0.1
sphinxcontrib-applehelp==2.0.0
sphinxcontrib-devhelp==2.0.0
sphinxcontrib-htmlhelp==2.1.0
sphinxcontrib-jquery==4.1
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==2.0.0
sphinxcontrib-serializinghtml==2.0.0
starlette==0.38.6
starlette==0.40.0
tomli==2.0.2; python_version < "3.11"
types-aiofiles==24.1.0.20240626
types-cffi==1.16.0.20240331
types-cryptography==3.3.23.2
types-jwt==0.1.3
types-orjson==3.6.2
types-pyopenssl==24.1.0.20240722
types-python-dateutil==2.9.0.20240906
types-python-dateutil==2.9.0.20241003
types-pyyaml==6.0.12.20240917
types-redis==4.6.0.20240903
types-redis==4.6.0.20241004
types-requests==2.31.0.6
types-setuptools==75.1.0.20240917
types-setuptools==75.2.0.20241019
types-ujson==5.10.0.20240515
types-urllib3==1.26.25.14
typing-extensions==4.12.2
urllib3==1.26.20
uvicorn==0.30.6
uvloop==0.20.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy"
virtualenv==20.26.5
uvicorn[standard]==0.32.0
uvloop==0.21.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy"
virtualenv==20.27.0
watchfiles==0.24.0
websockets==13.1
zipp==3.20.2; python_full_version < "3.10.2"
4 changes: 3 additions & 1 deletion tests/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class TestWEI_Base(unittest.TestCase):
campaign_name="Test_Campaign",
campaign_description="A campaign for automated testing",
)
experiment_client = None

def __init__(self, *args, **kwargs):
"""Basic setup for WEI's pytest tests"""
Expand All @@ -45,7 +46,8 @@ def __init__(self, *args, **kwargs):

def __del__(self):
"""Basic cleanup for WEI's pytest tests"""
self.experiment_client.log_experiment_end()
if self.experiment_client:
self.experiment_client.log_experiment_end()


class TestPackaging(TestWEI_Base):
Expand Down

0 comments on commit e852254

Please sign in to comment.