channel-app 0.0.157a5__tar.gz → 0.0.157a7__tar.gz

{channel_app-0.0.157a5 → channel_app-0.0.157a7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: channel_app
-Version: 0.0.157a5
+Version: 0.0.157a7
 Summary: Channel app for Sales Channels
 Home-page: https://github.com/akinon/channel_app
 Author: akinonteam

{channel_app-0.0.157a5 → channel_app-0.0.157a7/channel_app}/alembic.ini

@@ -3,7 +3,7 @@
 [alembic]
 # path to migration scripts
 # Use forward slashes (/) also on windows to provide an os agnostic path
-script_location = channel_app/database/migrations
+script_location = database/migrations
 
 # template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
 # Uncomment the line below if you want the files to be prepended with date and time

{channel_app-0.0.157a5 → channel_app-0.0.157a7}/channel_app/database/migrations/env.py

@@ -6,6 +6,7 @@ from sqlalchemy import pool
 
 from alembic import context
 
+from channel_app.core import settings
 from channel_app.database.models import Base as BaseModel
 
 # this is the Alembic Config object, which provides
@@ -28,6 +29,9 @@ target_metadata = BaseModel.metadata
 # my_important_option = config.get_main_option("my_important_option")
 # ... etc.
 
+DATABASE_URL = f"postgresql+psycopg2://{settings.DB_USER}:{settings.DB_PASSWORD}@{settings.DB_HOST}:{settings.DB_PORT}/{settings.DB_NAME}"
+url = config.set_main_option("sqlalchemy.url", DATABASE_URL)
+
 
 def run_migrations_offline() -> None:
     """Run migrations in 'offline' mode.
@@ -43,9 +47,8 @@ def run_migrations_offline() -> None:
     """
     url = config.get_main_option("sqlalchemy.url")
     
-    DATABASE_URL = os.getenv("DATABASE_URI")
-    if DATABASE_URL:
-        url = config.set_main_option("sqlalchemy.url", DATABASE_URL)
+    DATABASE_URL = f"postgresql+psycopg2://{settings.DB_USER}:{settings.DB_PASSWORD}@{settings.DB_HOST}:{settings.DB_PORT}/{settings.DB_NAME}"
+    url = config.set_main_option("sqlalchemy.url", DATABASE_URL)
 
     context.configure(
         url=url,

{channel_app-0.0.157a5 → channel_app-0.0.157a7}/channel_app.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: channel-app
-Version: 0.0.157a5
+Version: 0.0.157a7
 Summary: Channel app for Sales Channels
 Home-page: https://github.com/akinon/channel_app
 Author: akinonteam

{channel_app-0.0.157a5 → channel_app-0.0.157a7}/channel_app.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ Makefile
 Procfile-dist
 README.md
 akinon.json-dist
-alembic.ini
 bitbucket-pipelines.yml
 build.sh-dist
 requirements-dev.txt
@@ -12,6 +11,7 @@ setup.py
 tox.ini
 .vscode/settings.json
 channel_app/__init__.py
+channel_app/alembic.ini
 channel_app.egg-info/PKG-INFO
 channel_app.egg-info/SOURCES.txt
 channel_app.egg-info/dependency_links.txt
@@ -54,6 +54,7 @@ channel_app/database/__init__.py
 channel_app/database/models.py
 channel_app/database/services.py
 channel_app/database/migrations/README
+channel_app/database/migrations/__init__.py
 channel_app/database/migrations/env.py
 channel_app/database/migrations/script.py.mako
 channel_app/database/migrations/versions/6049560b1ecb_create_flow_logs.py

{channel_app-0.0.157a5 → channel_app-0.0.157a7}/setup.py

@@ -5,7 +5,7 @@ with open("README.md") as f:
 
 setup(
     name="channel_app",
-    version="0.0.157a5", # alpha prerelease
+    version="0.0.157a7", # alpha prerelease
     packages=find_packages(),
     url="https://github.com/akinon/channel_app",
     description="Channel app for Sales Channels",