Skip to content

Commit

Permalink
Merge pull request #406 from atlas-bi/alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherpickering committed Jun 15, 2023
2 parents f484b8c + 876a964 commit ffa1245
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.10.1
2.10.2-alpha.1
28 changes: 14 additions & 14 deletions migrations/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
18 changes: 17 additions & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit ffa1245

Please sign in to comment.