Merge pull request #8 from thorwolpert/main

moving back flask & python versions
bcgov · May 14, 2024 · bbaee78 · bbaee78
2 parents e3ac8ce + a557ca1
commit bbaee78
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,11 @@
 ```bash
 gcloud init
 ```
-
+Get your default credentials in place
+```bash
+gcloud auth application-default login
+```
+Register the python artifact repo as _sbc-connect_
 ```bash
 export SBC_CONNECT_PYTHON_REPO_URL="https://northamerica-northeast1-python.pkg.dev/c4hnrd-tools/python/"
 poetry config repositories.sbc-connect $SBC_CONNECT_PYTHON_REPO_URL

diff --git a/python/gcp-queue/README.md b/python/gcp-queue/README.md
@@ -11,7 +11,7 @@ GCP Queue Flask Module
 
 ## Installing
 ```bash
-export SBC_CONNECT_PYTHON_REPO_URL="https://northamerica-northeast1-python.pkg.dev/c4hnrd-tools/python/"
+export SBC_CONNECT_PYTHON_REPO_URL="https://northamerica-northeast1-python.pkg.dev/c4hnrd-tools/python/simple/"
 poetry config repositories.sbc-connect $SBC_CONNECT_PYTHON_REPO_URL
 poetry source add --priority=explicit sbc-connect $SBC_CONNECT_PYTHON_REPO_URL
 poetry add --source sbc-connect gcp-queue
@@ -31,7 +31,6 @@ Install the dependencies
 poetry install
 ```
 
-Configure the .env
 
 ## How to Contribute
 

diff --git a/python/gcp-queue/poetry.lock b/python/gcp-queue/poetry.lock
diff --git a/python/gcp-queue/pyproject.toml b/python/gcp-queue/pyproject.toml
@@ -1,14 +1,14 @@
 [tool.poetry]
 name = "gcp_queue"
-version = "0.2.0"
+version = "0.3.0"
 description = ""
 authors = ["thorwolpert <[email protected]>"]
 readme = "README.md"
 packages = [{include = "gcp_queue", from = "src"}]
 
 [tool.poetry.dependencies]
-python = "^3.10"
-flask = "^3.0.2"
+python = "^3.9"
+flask = ">=1"
 google-auth = "^2.28.2"
 google-cloud-pubsub = "^2.20.2"
 simple-cloudevent = {git = "https://github.com/daxiom/simple-cloudevent.py.git"}

diff --git a/python/structured-logging/poetry.lock b/python/structured-logging/poetry.lock
diff --git a/python/structured-logging/pyproject.toml b/python/structured-logging/pyproject.toml
@@ -1,15 +1,15 @@
 [tool.poetry]
 name = "structured-logging"
-version = "0.3.0"
+version = "0.4.0"
 description = ""
 authors = ["thorwolpert <[email protected]>"]
 readme = "README.md"
 packages = [{include = "structured_logging", from = "src"}]
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.9"
 structlog = "^24.1.0"
-flask = ">= 2"
+flask = ">= 1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.2.0"

diff --git a/python/structured-logging/tests/unit/test_structured_logging.py b/python/structured-logging/tests/unit/test_structured_logging.py
@@ -64,7 +64,7 @@ def test_flask_no_init_logger(capsys):
     json_out = json.loads(captured.out)
     assert isinstance(json_out, dict)
     assert json_out['severity'] == 'warning'
-    assert json_out['message'] == msg   
+    assert json_out['message'] == msg
 
     check_logger = app.config.get(StructuredLogging.MODULE_NAME)
     assert not check_logger