diff --git a/Makefile b/Makefile index 239f359d..14b944f6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ prefix := /var/www/workflow -PYTHON_VERSION:=3.10 +PYTHON_VERSION:=3.12 # these are defined here because I couldn't figure out how to evaluate the commands # during target execution rather then when make parses the file diff --git a/conda_development.yml b/conda_development.yml index 04b773ff..dc8443a9 100644 --- a/conda_development.yml +++ b/conda_development.yml @@ -4,8 +4,8 @@ dependencies: - flake8 - python-dotenv - python-build - - pytest<7 - - pytest-django<4.6 + - pytest + - pytest-django - pytest-cov - pre-commit - sphinx @@ -13,4 +13,3 @@ dependencies: - lxml - wheel - check-wheel-contents - - pytest-pythonpath diff --git a/conda_environment.yml b/conda_environment.yml index 0014e537..4638e171 100644 --- a/conda_environment.yml +++ b/conda_environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge - oncat dependencies: - - python=3.10 + - python=3.12 - django=4.2 - gunicorn - httplib2 diff --git a/setup.cfg b/setup.cfg index 53b2de09..fa467650 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,7 @@ ignore = E722, W504, W503 max-line-length = 120 [tool:pytest] -python_paths = src/ src/dasmon_app src/webmon_app src/workflow_app +pythonpath = src/ src/dasmon_app src/webmon_app src/workflow_app [coverage:run] source = src diff --git a/src/webmon_app/docker-entrypoint.sh b/src/webmon_app/docker-entrypoint.sh index 43683edd..2742c47b 100755 --- a/src/webmon_app/docker-entrypoint.sh +++ b/src/webmon_app/docker-entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -MANAGE_PY_WEBMON="/opt/conda/lib/python3.10/site-packages/reporting/manage.py" +MANAGE_PY_WEBMON="/opt/conda/lib/python3.12/site-packages/reporting/manage.py" # wait for postgress to be available until PGPASSWORD=${DATABASE_PASS} psql -h "${DATABASE_HOST}" -U "${DATABASE_USER}" -d "${DATABASE_NAME}" -c '\q'; do