From 1cd4dbd08bf2c16b04b8b018e83751bf4568d8d1 Mon Sep 17 00:00:00 2001 From: Christopher Pickering Date: Thu, 15 Jun 2023 08:52:31 -0500 Subject: [PATCH 1/3] fix(deps): fixed a missing shim dep, fixed format on migration file --- migrations/env.py | 28 ++++++++++++++-------------- poetry.lock | 18 +++++++++++++++++- pyproject.toml | 1 + 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/migrations/env.py b/migrations/env.py index 74d69a8f..9411efaa 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -22,20 +22,20 @@ def get_engine(): - try: - # this works with Flask-SQLAlchemy<3 and Alchemical - return current_app.extensions['migrate'].db.get_engine() - except TypeError: - # this works with Flask-SQLAlchemy>=3 - return current_app.extensions['migrate'].db.engine - - - def get_engine_url(): - try: - return get_engine().url.render_as_string(hide_password=False).replace( - '%', '%%') - except AttributeError: - return str(get_engine().url).replace('%', '%%') + try: + # this works with Flask-SQLAlchemy<3 and Alchemical + return current_app.extensions['migrate'].db.get_engine() + except TypeError: + # this works with Flask-SQLAlchemy>=3 + return current_app.extensions['migrate'].db.engine + + +def get_engine_url(): + try: + return get_engine().url.render_as_string(hide_password=False).replace( + '%', '%%') + except AttributeError: + return str(get_engine().url).replace('%', '%%') config.set_main_option('sqlalchemy.url', get_engine_url()) target_db = current_app.extensions['migrate'].db diff --git a/poetry.lock b/poetry.lock index a3e2ea16..3560bcff 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2254,6 +2254,22 @@ files = [ {file = "pytz-2022.7.1.tar.gz", hash = "sha256:01a0681c4b9684a28304615eba55d1ab31ae00bf68ec157ec3708a8182dbbcd0"}, ] +[[package]] +name = "pytz-deprecation-shim" +version = "0.1.0.post0" +description = "Shims to make deprecation of pytz easier" +category = "main" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" +files = [ + {file = "pytz_deprecation_shim-0.1.0.post0-py2.py3-none-any.whl", hash = "sha256:8314c9692a636c8eb3bda879b9f119e350e93223ae83e70e80c31675a0fdc1a6"}, + {file = "pytz_deprecation_shim-0.1.0.post0.tar.gz", hash = "sha256:af097bae1b616dde5c5744441e2ddc69e74dfdcb0c263129610d85b87445a59d"}, +] + +[package.dependencies] +"backports.zoneinfo" = {version = "*", markers = "python_version >= \"3.6\" and python_version < \"3.9\""} +tzdata = {version = "*", markers = "python_version >= \"3.6\""} + [[package]] name = "pyyaml" version = "6.0" @@ -3227,4 +3243,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<4.0" -content-hash = "5fedfd00b18a9385638ca90376a3af274a2304ebe0b738418fbd73cf5da3ad4f" +content-hash = "b9cfe86db5156a3f8c60488dd9eb9cef735614e413972c3318baaf9b3d227fd2" diff --git a/pyproject.toml b/pyproject.toml index b1b5ea96..5486db7d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -135,6 +135,7 @@ python-dateutil = "^2.8.2" python-gnupg = "^0.5.0" python-ldap = "^3.3.1" python3-saml = "^1.12.0" +pytz-deprecation-shim = "^0.1.0.post0" rcssmin = "^1.0.6" redis = "^4.0.0" regex = "^2023.0.0" From fe2223c8544f466949e2d98e8d173ad4dde9c943 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 15 Jun 2023 14:07:17 +0000 Subject: [PATCH 2/3] chore(release): 2.10.1-alpha.2 [skip ci] ## [2.10.1-alpha.2](https://github.com/atlas-bi/atlas-automation-hub/compare/v2.10.1-alpha.1...v2.10.1-alpha.2) (2023-06-15) ### Bug Fixes * **deps:** fixed a missing shim dep, fixed format on migration file ([1cd4dbd](https://github.com/atlas-bi/atlas-automation-hub/commit/1cd4dbd08bf2c16b04b8b018e83751bf4568d8d1)) --- .version | 2 +- package.json | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.version b/.version index 786dcea5..51fec5ba 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.10.1-alpha.1 +2.10.1-alpha.2 diff --git a/package.json b/package.json index c93fcf41..85761363 100644 --- a/package.json +++ b/package.json @@ -80,5 +80,5 @@ "test:lint": "poetry run tox -e lint", "test:prettier": "prettier --check --config .prettierrc \"web/**/*.{ts,css,less,scss,js,json,md,yaml,html}\"" }, - "version": "2.10.1-alpha.1" + "version": "2.10.1-alpha.2" } diff --git a/pyproject.toml b/pyproject.toml index a28c8973..524a1093 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -97,7 +97,7 @@ packages = [ ] readme = "readme.md" repository = "https://github.com/atlas-bi/Hub" -version = "2.10.1-alpha.1" +version = "2.10.1-alpha.2" [tool.poetry.dependencies] Flask = "^2.0.1" From 876a9642ede976c1a1a62e96baf4df8d03d8fcca Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 15 Jun 2023 14:47:09 +0000 Subject: [PATCH 3/3] chore(release): 2.10.2-alpha.1 [skip ci] ## [2.10.2-alpha.1](https://github.com/atlas-bi/atlas-automation-hub/compare/v2.10.1...v2.10.2-alpha.1) (2023-06-15) ### Bug Fixes * **deps:** fixed a missing shim dep, fixed format on migration file ([1cd4dbd](https://github.com/atlas-bi/atlas-automation-hub/commit/1cd4dbd08bf2c16b04b8b018e83751bf4568d8d1)) --- .version | 2 +- package.json | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.version b/.version index 8bbb6e40..3a75d402 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.10.1 +2.10.2-alpha.1 diff --git a/package.json b/package.json index 95c4b9e8..5ca0b3b6 100644 --- a/package.json +++ b/package.json @@ -80,5 +80,5 @@ "test:lint": "poetry run tox -e lint", "test:prettier": "prettier --check --config .prettierrc \"web/**/*.{ts,css,less,scss,js,json,md,yaml,html}\"" }, - "version": "2.10.1" + "version": "2.10.2-alpha.1" } diff --git a/pyproject.toml b/pyproject.toml index d47b99f5..0d7f3f52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -97,7 +97,7 @@ packages = [ ] readme = "readme.md" repository = "https://github.com/atlas-bi/Hub" -version = "2.10.1" +version = "2.10.2-alpha.1" [tool.poetry.dependencies] Flask = "^2.0.1"