revert some changes

bcgov · Sep 5, 2024 · a2c689d · a2c689d
1 parent 7e4e154
commit a2c689d
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 15 deletions.
diff --git a/.github/workflows/auth-queue-ci.yml b/.github/workflows/auth-queue-ci.yml
@@ -32,7 +32,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.12]
+        python-version: [3.8]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/queue_services/auth-queue/Dockerfile b/queue_services/auth-queue/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.2 as development_build
+FROM python:3.8.10 as development_build
 
 ARG VCS_REF="missing"
 ARG BUILD_DATE="missing"

diff --git a/queue_services/auth-queue/Makefile b/queue_services/auth-queue/Makefile
@@ -41,11 +41,14 @@ update: ## Upgrade lock
 	poetry update
 
 install: clean ## Install python virtrual environment
-	test -f .venv/bin/activate || python3.12 -m venv  $(CURRENT_ABS_DIR)/.venv ;\
-	. .venv/bin/activate ;\
-	pipx install poetry
+	unset HOME ## unset HOME because it's in the DEV .env file, will cause permissions issues
+	pip install poetry ;\
 	poetry install
 
+install-dev: ## Instal development dependencies
+	poetry add --dev pylint astroid
+	poetry install --with dev
+
 #################################################################################
 # COMMANDS - CI                                                                 #
 #################################################################################
@@ -60,7 +63,7 @@ flake8: ## Linting with flake8
 lint: pylint flake8 ## run all lint type scripts
 
 test: ## Unit testing
-	. .venv/bin/activate && pytest
+	poetry run pytest
 
 mac-cov: test ## Run the coverage report and display in a browser window (mac)
 	@open -a "Google Chrome" htmlcov/index.html

diff --git a/queue_services/auth-queue/poetry.lock b/queue_services/auth-queue/poetry.lock
diff --git a/queue_services/auth-queue/pyproject.toml b/queue_services/auth-queue/pyproject.toml
@@ -6,7 +6,7 @@ authors = ["\"BC Registries and Online Services\""]
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "^3.12"
+python = "^3.8"
 CacheControl = "0.14.0"
 Flask = "1.1.2"
 Jinja2 = "3.0.3"