dmart 1.4.10__py3-none-any.whl → 1.4.12__py3-none-any.whl

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 = dmart_migrations
+script_location = alembic
 
 # 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

{dmart-1.4.10.dist-info → dmart-1.4.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dmart
-Version: 1.4.10
+Version: 1.4.12
 Requires-Python: >=3.11
 Requires-Dist: fastapi
 Requires-Dist: pydantic

{dmart-1.4.10.dist-info → dmart-1.4.12.dist-info}/RECORD

@@ -1,7 +1,7 @@
-alembic.ini,sha256=zs8d8VhH9TRwZrPK697EZPBCfaKvI4SqTuGuG0FAm2Y,3747
+alembic.ini,sha256=wQweByyHQm-EI8BQkE0SHNRjULJ6Xn5jqgvv88IT5Sg,3738
 bundler.py,sha256=so8ZJResb1PcOH5vboa_mpFAdYr_T8u8DbbFXd570Lg,1704
 data_generator.py,sha256=CnE-VHEeX7-lAXtqCgbRqR9WHjTuOgeiZcviYrHAmho,2287
-dmart.py,sha256=_eXSPzHwdjlPG_v5rvVQslj7ny68-ll6HZ1jCvCKswI,25808
+dmart.py,sha256=5ukER8Qs2kL8E-XFc1jzvJU-nDiG69Akh_lZeVwWzwI,24451
 get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 info.json,sha256=hXQWl19lfMkEj_zXdehGeKjiKGNJ7emY4S7d4pIqJ1E,123
 main.py,sha256=KZGhIL6AnEm5ZAPy4IvhBDpzSTjuodilV7NafNOyhzM,19676
@@ -175,7 +175,7 @@ data_adapters/sql/json_to_db_migration.py,sha256=KaubDrRZ3MfPLc-CNGPpsEccPELKr1V
 data_adapters/sql/update_query_policies.py,sha256=LUpkyzDAkiwwVWnXxPdVAU6atehW72ECAazj3mEYHK0,3857
 dmart_migrations/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
 dmart_migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dmart_migrations/env.py,sha256=ahYndeefOvhqeZ7EQMkI1NdqJVQCUqLxYNP_MtJeDfY,2821
+dmart_migrations/env.py,sha256=P1gnJRIUrP2jLHZ7HDbfkzkpuZJ_LMWqw05HIqOUJHo,3110
 dmart_migrations/notes.txt,sha256=X7LYSNmulLRiAUXvw07Z85bSGRTnx4NUpoNC9D2DfO8,395
 dmart_migrations/script.py.mako,sha256=u-ABdYW1tcIILgJFJdQZYLxoAI8Awd6wZbx30rY6fxU,680
 dmart_migrations/__pycache__/__init__.cpython-314.pyc,sha256=CcFVDJxqk1nR7sZH9dbbffqoMo0jRHW-MiSSGFX--qA,174
@@ -282,8 +282,8 @@ utils/ticket_sys_utils.py,sha256=9QAlW2iiy8KyxQRBDj_WmzS5kKb0aYJmGwd4qzmGVqo,700
 utils/web_notifier.py,sha256=QM87VVid2grC5lK3NdS1yzz0z1wXljr4GChJOeK86W4,843
 utils/templates/activation.html.j2,sha256=XAMKCdoqONoc4ZQucD0yV-Pg5DlHHASZrTVItNS-iBE,640
 utils/templates/reminder.html.j2,sha256=aoS8bTs56q4hjAZKsb0jV9c-PIURBELuBOpT_qPZNVU,639
-dmart-1.4.10.dist-info/METADATA,sha256=1JEg-JLqBDSHLzH8bkIzY4p1gDKbX9bWYcsKc3cIfHQ,2069
-dmart-1.4.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dmart-1.4.10.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
-dmart-1.4.10.dist-info/top_level.txt,sha256=XELQhaIfj-qupnyBrir39qFRh8ncu1RXkCHeitzqLLg,275
-dmart-1.4.10.dist-info/RECORD,,
+dmart-1.4.12.dist-info/METADATA,sha256=rrCC2m1y-WMaLajuBNZIRSpyAxJT7ZAjpIB574knJIM,2069
+dmart-1.4.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.12.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
+dmart-1.4.12.dist-info/top_level.txt,sha256=XELQhaIfj-qupnyBrir39qFRh8ncu1RXkCHeitzqLLg,275
+dmart-1.4.12.dist-info/RECORD,,

dmart.py

@@ -536,29 +536,8 @@ def main():
         case "migrate":
             pkg_dir = Path(__file__).resolve().parent
             
-            # Check for shadowing alembic directory and rename it if necessary
-            shadowing_alembic = pkg_dir / "alembic"
-            target_migrations = pkg_dir / "dmart_migrations"
-            
-            if shadowing_alembic.exists() and shadowing_alembic.is_dir():
-                if target_migrations.exists():
-                    print(f"Warning: Both {shadowing_alembic} and {target_migrations} exist.")
-                    backup_path = pkg_dir / "alembic_backup"
-                    if not backup_path.exists():
-                        print(f"Renaming {shadowing_alembic} to {backup_path} to avoid shadowing 'alembic' library.")
-                        shutil.move(str(shadowing_alembic), str(backup_path))
-                    else:
-                        print(f"Error: {shadowing_alembic} exists and shadows 'alembic' library, but {target_migrations} and {backup_path} also exist.")
-                        print("Please manually remove or rename the 'alembic' directory.")
-                        sys.exit(1)
-                else:
-                    print(f"Renaming {shadowing_alembic} to {target_migrations} to avoid shadowing 'alembic' library.")
-                    shutil.move(str(shadowing_alembic), str(target_migrations))
-            
             # Try to find migrations directory
-            alembic_dir = target_migrations
-            if not alembic_dir.exists():
-                alembic_dir = pkg_dir / "alembic"
+            alembic_dir = pkg_dir / "alembic"
             
             original_ini_path = pkg_dir / "alembic.ini"
             if not original_ini_path.exists():

dmart_migrations/env.py

@@ -1,3 +1,9 @@
+import sys
+import os
+# Add the parent directory (backend) to sys.path to allow importing modules from it
+# This is done here to avoid adding it to PYTHONPATH globally which causes shadowing of 'alembic' library
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
 from logging.config import fileConfig
 
 from sqlalchemy import engine_from_config