Skip to content

Commit

Permalink
Move to newer version of python and pytest
Browse files Browse the repository at this point in the history
  • Loading branch information
rosswhitfield committed Jan 8, 2025
1 parent a602dee commit 6a64f13
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 2 additions & 3 deletions conda_development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ dependencies:
- flake8
- python-dotenv
- python-build
- pytest<7
- pytest-django<4.6
- pytest
- pytest-django
- pytest-cov
- pre-commit
- sphinx
- sphinx_rtd_theme=1.2.*
- lxml
- wheel
- check-wheel-contents
- pytest-pythonpath
2 changes: 1 addition & 1 deletion conda_environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
- oncat
dependencies:
- python=3.10
- python=3.12
- django=4.2
- gunicorn
- httplib2
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/webmon_app/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 6a64f13

Please sign in to comment.