Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PyPI publishing from CI #111

Merged
merged 5 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/client-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Execute python tests
run: |
uv pip install . # need to install without --no-deps to work around non-portable dependency resolution in `uv pip compile`
uv run pytest --cov=src --cov-report=xml --junitxml=junit.xml
uv run pytest -s --cov=src --cov-report=xml --junitxml=junit.xml
- name: Upload results to Codecov
uses: codecov/codecov-action@v4
with:
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,24 @@ jobs:
alias: latest
push: true
workingDirectory: client
publish-pypi:
runs-on: ubuntu-latest
needs: build-release
permissions:
# required for trusted publishing
id-token: write
steps:
- name: Download build artifacts
uses: actions/download-artifact@v4
with:
name: dist
path: dist
- name: Publish distribution 📦 to Test PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
skip-existing: true # tolerate release package file duplicates
repository-url: https://test.pypi.org/legacy/
- name: Publish distribution 📦 to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
attestations: true
5 changes: 3 additions & 2 deletions backend/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ requires = ["setuptools>=62", "setuptools-scm[toml]", "wheel"]
build-backend = "setuptools.build_meta"

[project]
name = "jobq-server"
name = "aai-jobq-server"
description = ""
version = "0.1.0"
readme = "README.md"
Expand All @@ -21,7 +21,8 @@ dependencies = [
"uvicorn",
"docker",
"kubernetes",
"jobq @ git+https://github.com/aai-institute/jobq.git@main#subdirectory=client",
# FIXME: Revert to main branch once PR is merged
"aai-jobq @ git+https://github.com/aai-institute/jobq.git@28b535e905e9b7dd4195c928ed02bbf186235f91#subdirectory=client",
]

[project.optional-dependencies]
Expand Down
30 changes: 15 additions & 15 deletions backend/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --all-extras -o requirements-dev.txt pyproject.toml
aai-jobq @ git+https://github.com/aai-institute/jobq.git@28b535e905e9b7dd4195c928ed02bbf186235f91#subdirectory=client
# via aai-jobq-server (pyproject.toml)
annotated-types==0.7.0
# via pydantic
anyio==4.4.0
Expand All @@ -8,7 +10,7 @@ anyio==4.4.0
# starlette
# watchfiles
build==1.2.1
# via jobq-server (pyproject.toml)
# via aai-jobq-server (pyproject.toml)
cachetools==5.4.0
# via google-auth
certifi==2024.7.4
Expand All @@ -33,12 +35,12 @@ dnspython==2.6.1
# via email-validator
docker==7.1.0
# via
# jobq-server (pyproject.toml)
# aai-jobq-server (pyproject.toml)
# testcontainers
email-validator==2.2.0
# via fastapi
fastapi==0.112.0
# via jobq-server (pyproject.toml)
# via aai-jobq-server (pyproject.toml)
fastapi-cli==0.0.5
# via fastapi
filelock==3.15.4
Expand Down Expand Up @@ -67,10 +69,8 @@ iniconfig==2.0.0
# via pytest
jinja2==3.1.4
# via fastapi
jobq @ git+https://github.com/aai-institute/jobq.git@3c3f339cac979bfa8b54a0019ce6a78045f2a33a#subdirectory=client
# via jobq-server (pyproject.toml)
kubernetes==30.1.0
# via jobq-server (pyproject.toml)
# via aai-jobq-server (pyproject.toml)
markdown-it-py==3.0.0
# via rich
markupsafe==2.1.5
Expand All @@ -92,7 +92,7 @@ platformdirs==4.2.2
pluggy==1.5.0
# via pytest
pre-commit==3.8.0
# via jobq-server (pyproject.toml)
# via aai-jobq-server (pyproject.toml)
pyasn1==0.6.0
# via
# pyasn1-modules
Expand All @@ -101,8 +101,8 @@ pyasn1-modules==0.4.0
# via google-auth
pydantic==2.8.2
# via
# aai-jobq
# fastapi
# jobq
pydantic-core==2.20.1
# via pydantic
pygments==2.18.0
Expand All @@ -111,13 +111,13 @@ pyproject-hooks==1.1.0
# via build
pytest==8.3.2
# via
# jobq-server (pyproject.toml)
# aai-jobq-server (pyproject.toml)
# pytest-cov
# pytest-mock
pytest-cov==5.0.0
# via jobq-server (pyproject.toml)
# via aai-jobq-server (pyproject.toml)
pytest-mock==3.14.0
# via jobq-server (pyproject.toml)
# via aai-jobq-server (pyproject.toml)
python-dateutil==2.9.0.post0
# via kubernetes
python-dotenv==1.0.1
Expand All @@ -126,7 +126,7 @@ python-multipart==0.0.9
# via fastapi
pyyaml==6.0.2
# via
# jobq
# aai-jobq
# kubernetes
# pre-commit
# uvicorn
Expand All @@ -142,7 +142,7 @@ rich==13.7.1
rsa==4.9
# via google-auth
ruff==0.5.6
# via jobq-server (pyproject.toml)
# via aai-jobq-server (pyproject.toml)
shellingham==1.5.4
# via typer
six==1.16.0
Expand All @@ -156,7 +156,7 @@ sniffio==1.3.1
starlette==0.37.2
# via fastapi
testcontainers==4.8.0
# via jobq-server (pyproject.toml)
# via aai-jobq-server (pyproject.toml)
typer==0.12.3
# via fastapi-cli
typing-extensions==4.12.2
Expand All @@ -174,7 +174,7 @@ urllib3==2.2.2
# testcontainers
uvicorn==0.30.5
# via
# jobq-server (pyproject.toml)
# aai-jobq-server (pyproject.toml)
# fastapi
# fastapi-cli
uvloop==0.19.0
Expand Down
16 changes: 8 additions & 8 deletions backend/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --strip-extras -o requirements.txt pyproject.toml
aai-jobq @ git+https://github.com/aai-institute/jobq.git@28b535e905e9b7dd4195c928ed02bbf186235f91#subdirectory=client
# via aai-jobq-server (pyproject.toml)
annotated-types==0.7.0
# via pydantic
anyio==4.4.0
Expand All @@ -15,9 +17,9 @@ charset-normalizer==3.3.2
click==8.1.7
# via uvicorn
docker==7.1.0
# via jobq-server (pyproject.toml)
# via aai-jobq-server (pyproject.toml)
fastapi==0.112.0
# via jobq-server (pyproject.toml)
# via aai-jobq-server (pyproject.toml)
google-auth==2.33.0
# via kubernetes
h11==0.14.0
Expand All @@ -26,10 +28,8 @@ idna==3.7
# via
# anyio
# requests
jobq @ git+https://github.com/aai-institute/jobq.git@3c3f339cac979bfa8b54a0019ce6a78045f2a33a#subdirectory=client
# via jobq-server (pyproject.toml)
kubernetes==30.1.0
# via jobq-server (pyproject.toml)
# via aai-jobq-server (pyproject.toml)
oauthlib==3.2.2
# via
# kubernetes
Expand All @@ -42,15 +42,15 @@ pyasn1-modules==0.4.0
# via google-auth
pydantic==2.8.2
# via
# aai-jobq
# fastapi
# jobq
pydantic-core==2.20.1
# via pydantic
python-dateutil==2.9.0.post0
# via kubernetes
pyyaml==6.0.2
# via
# jobq
# aai-jobq
# kubernetes
requests==2.32.3
# via
Expand Down Expand Up @@ -80,6 +80,6 @@ urllib3==2.2.2
# kubernetes
# requests
uvicorn==0.30.6
# via jobq-server (pyproject.toml)
# via aai-jobq-server (pyproject.toml)
websocket-client==1.8.0
# via kubernetes
2 changes: 1 addition & 1 deletion client/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ requires = ["setuptools>=62", "setuptools-scm[toml]", "wheel"]
build-backend = "setuptools.build_meta"

[project]
name = "jobq"
name = "aai-jobq"
description = ""
version = "0.1.0"
readme = "README.md"
Expand Down
50 changes: 25 additions & 25 deletions client/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
annotated-types==0.7.0
# via pydantic
appnope==0.1.4
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
babel==2.16.0
# via mkdocs-material
black==24.8.0
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
build==1.2.1
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
certifi==2024.8.30
# via requests
cfgv==3.4.0
Expand All @@ -18,7 +18,7 @@ charset-normalizer==3.3.2
# via requests
click==8.1.7
# via
# jobq (pyproject.toml)
# aai-jobq (pyproject.toml)
# black
# mkdocs
# mkdocstrings
Expand All @@ -31,17 +31,17 @@ coverage==7.6.1
distlib==0.3.8
# via virtualenv
docker==7.1.0
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
docstring-parser==0.16
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
filelock==3.15.4
# via virtualenv
ghp-import==2.1.0
# via mkdocs
griffe==1.2.0
# via mkdocstrings-python
humanize==4.10.0
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
identify==2.6.0
# via pre-commit
idna==3.8
Expand Down Expand Up @@ -80,10 +80,10 @@ mergedeep==1.3.4
# mkdocs
# mkdocs-get-deps
mike==2.1.3
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
mkdocs==1.6.1
# via
# jobq (pyproject.toml)
# aai-jobq (pyproject.toml)
# mike
# mkdocs-autorefs
# mkdocs-callouts
Expand All @@ -98,24 +98,24 @@ mkdocs-autorefs==1.2.0
# mkdocstrings
# mkdocstrings-python
mkdocs-callouts==1.14.0
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
mkdocs-gen-files==0.5.0
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
mkdocs-get-deps==0.2.0
# via mkdocs
mkdocs-include-dir-to-nav==1.2.0
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
mkdocs-literate-nav==0.6.1
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
mkdocs-material==9.5.34
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
mkdocs-material-extensions==1.3.1
# via mkdocs-material
mkdocs-section-index==0.3.9
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
mkdocstrings==0.26.0
# via
# jobq (pyproject.toml)
# aai-jobq (pyproject.toml)
# mkdocstrings-python
mkdocstrings-python==1.11.1
# via mkdocstrings
Expand Down Expand Up @@ -144,15 +144,15 @@ platformdirs==4.2.2
pluggy==1.5.0
# via pytest
pre-commit==3.8.0
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
pydantic==2.9.0
# via
# jobq (pyproject.toml)
# aai-jobq (pyproject.toml)
# pydantic-settings
pydantic-core==2.23.2
# via pydantic
pydantic-settings==2.5.2
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
pygments==2.18.0
# via
# mkdocs-material
Expand All @@ -167,19 +167,19 @@ pyproject-hooks==1.1.0
# via build
pytest==8.3.2
# via
# jobq (pyproject.toml)
# aai-jobq (pyproject.toml)
# pytest-cov
pytest-cov==5.0.0
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
python-dateutil==2.9.0.post0
# via
# jobq (pyproject.toml)
# aai-jobq (pyproject.toml)
# ghp-import
python-dotenv==1.0.1
# via pydantic-settings
pyyaml==6.0.2
# via
# jobq (pyproject.toml)
# aai-jobq (pyproject.toml)
# mike
# mkdocs
# mkdocs-get-deps
Expand All @@ -197,9 +197,9 @@ requests==2.32.3
# docker
# mkdocs-material
rich==13.8.0
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
ruff==0.6.4
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
six==1.16.0
# via python-dateutil
typing-extensions==4.12.2
Expand Down
4 changes: 2 additions & 2 deletions client/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
annotated-types==0.7.0
# via pydantic
pydantic==2.9.0
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
pydantic-core==2.23.2
# via pydantic
pyyaml==6.0.2
# via jobq (pyproject.toml)
# via aai-jobq (pyproject.toml)
typing-extensions==4.12.2
# via
# pydantic
Expand Down
Loading