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

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

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

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

@@ -1,7 +1,7 @@
 alembic.ini,sha256=wQweByyHQm-EI8BQkE0SHNRjULJ6Xn5jqgvv88IT5Sg,3738
 bundler.py,sha256=so8ZJResb1PcOH5vboa_mpFAdYr_T8u8DbbFXd570Lg,1704
 data_generator.py,sha256=CnE-VHEeX7-lAXtqCgbRqR9WHjTuOgeiZcviYrHAmho,2287
-dmart.py,sha256=5ukER8Qs2kL8E-XFc1jzvJU-nDiG69Akh_lZeVwWzwI,24451
+dmart.py,sha256=dGBsl6j-cWD91aEeyw4VgHAG8Xh6sYrPXVKKUMRLMtk,24794
 get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 info.json,sha256=hXQWl19lfMkEj_zXdehGeKjiKGNJ7emY4S7d4pIqJ1E,123
 main.py,sha256=KZGhIL6AnEm5ZAPy4IvhBDpzSTjuodilV7NafNOyhzM,19676
@@ -178,7 +178,7 @@ dmart_migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 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
+dmart_migrations/__pycache__/__init__.cpython-314.pyc,sha256=BB6R74YhUmoPWg2dYz2gTIM0CE7sMcOt0dsgqEEPza4,174
 dmart_migrations/__pycache__/env.cpython-314.pyc,sha256=9L-2pPlUSIrHh1JLQilY0TDxqo7_ikqfKhFwImuCuwk,3935
 dmart_migrations/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dmart_migrations/scripts/calculate_checksums.py,sha256=v2NLEvReA9V3noJE-BWANgKDdhc8Mqg1ZmJJ8nc8sGI,3443
@@ -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.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-1.4.13.dist-info/METADATA,sha256=0d3-SkAFxQeeKVN8VClBRVNVJapIVbCXbvT8bwFV5fQ,2069
+dmart-1.4.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.13.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
+dmart-1.4.13.dist-info/top_level.txt,sha256=XELQhaIfj-qupnyBrir39qFRh8ncu1RXkCHeitzqLLg,275
+dmart-1.4.13.dist-info/RECORD,,

dmart.py

@@ -537,7 +537,10 @@ def main():
             pkg_dir = Path(__file__).resolve().parent
             
             # Try to find migrations directory
-            alembic_dir = pkg_dir / "alembic"
+            # When installed via PyPI, it's renamed to dmart_migrations to avoid conflict with alembic library
+            alembic_dir = pkg_dir / "dmart_migrations"
+            if not alembic_dir.exists():
+                alembic_dir = pkg_dir / "alembic"
             
             original_ini_path = pkg_dir / "alembic.ini"
             if not original_ini_path.exists():
@@ -560,10 +563,13 @@ def main():
                 # Check if alembic is installed
                 check = subprocess.run(
                     [sys.executable, "-c", "import alembic"],
-                    capture_output=True
+                    capture_output=True,
+                    env=env
                 )
                 if check.returncode != 0:
                     print("Error: 'alembic' library not found. Please install it with 'pip install alembic'.")
+                    if check.stderr:
+                        print(f"Stderr: {check.stderr.decode()}")
                     sys.exit(1)
 
                 import tempfile