diff --git a/ci/general.yml b/ci/general.yml index 051c3001f8ba72148094f113eb7825e185eadd6d..bebb794a2af42be7dce1fd5a297c2114b954f410 100644 --- a/ci/general.yml +++ b/ci/general.yml @@ -1,4 +1,4 @@ -image: registry.edugit.org/teckids/team-sysadmin/docker-images/python-pimped:master@sha256:f0185bd50b45973fed48dee2ffcd11e2a95bd89e53d482e227005e69d298f70c +image: registry.edugit.org/teckids/team-sysadmin/docker-images/python-pimped:master@sha256:99fb58a4c7fbfa86ccc155585a782528aa5511032231d11907b5df797f47f697 stages: - prepare diff --git a/ci/prepare/lock.yml b/ci/prepare/lock.yml index 82788bbf4f3295f4f3b2b00e5afbb79adc10ca01..ef9174b49de02b38cb82a67bc12876e616eeced6 100644 --- a/ci/prepare/lock.yml +++ b/ci/prepare/lock.yml @@ -15,7 +15,7 @@ lock: else poetry version $(poetry version | cut -d" " -f2)+$(date --date=${CI_COMMIT_TIMESTAMP} +%Y%m%d%H%M%S).${CI_COMMIT_SHORT_SHA} ; fi - - poetry lock + - poetry lock -vvvv artifacts: paths: - poetry.lock diff --git a/ci/publish/pypi.yml b/ci/publish/pypi.yml index c0dd00ec74a152c75490bd450e3751a86be6bbdc..5f50114d34bb9d171c0492483553e49d51cd728e 100644 --- a/ci/publish/pypi.yml +++ b/ci/publish/pypi.yml @@ -15,7 +15,7 @@ deploy_gitlab: else poetry version $(poetry version | cut -d" " -f2)+$(date --date=${CI_COMMIT_TIMESTAMP} +%Y%m%d%H%M%S).${CI_COMMIT_SHORT_SHA} ; fi - - poetry publish -r gitlab + - POETRY_REQUESTS_TIMEOUT=60 poetry publish -r gitlab deploy_pypi: interruptible: true diff --git a/meta/aleksis-builddeps/pyproject.toml b/meta/aleksis-builddeps/pyproject.toml index 8a7efd5e6c1d2506d00cba3f4890794fea37b1f5..eda2055890db5441002283a7305d4d503c0ef8c0 100644 --- a/meta/aleksis-builddeps/pyproject.toml +++ b/meta/aleksis-builddeps/pyproject.toml @@ -18,11 +18,11 @@ classifiers = [ [tool.poetry.dependencies] python = "^3.9" -sphinx = "^6.1" +sphinx = "^7.0" sphinxcontrib-django = "^0.5.0" sphinxcontrib-svg2pdfconverter = "^1.1.1" sphinx-autodoc-typehints = "^1.7" -django-stubs = "^1.1" +django-stubs = "^4.2" pytest = "^7.2" pytest-django = "^4.1" pytest-django-testing-postgresql = "^0.2"