dmart 1.4.13__py3-none-any.whl → 1.4.15__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 = alembic
+script_location = dmart_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

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

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

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

@@ -1,7 +1,7 @@
-alembic.ini,sha256=wQweByyHQm-EI8BQkE0SHNRjULJ6Xn5jqgvv88IT5Sg,3738
+alembic.ini,sha256=zs8d8VhH9TRwZrPK697EZPBCfaKvI4SqTuGuG0FAm2Y,3747
 bundler.py,sha256=so8ZJResb1PcOH5vboa_mpFAdYr_T8u8DbbFXd570Lg,1704
 data_generator.py,sha256=CnE-VHEeX7-lAXtqCgbRqR9WHjTuOgeiZcviYrHAmho,2287
-dmart.py,sha256=dGBsl6j-cWD91aEeyw4VgHAG8Xh6sYrPXVKKUMRLMtk,24794
+dmart.py,sha256=ZoJwS2D0acAqSvsxwucOGwDDxVXAqnpxx64IkW6PVgA,23217
 get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 info.json,sha256=hXQWl19lfMkEj_zXdehGeKjiKGNJ7emY4S7d4pIqJ1E,123
 main.py,sha256=KZGhIL6AnEm5ZAPy4IvhBDpzSTjuodilV7NafNOyhzM,19676
@@ -179,7 +179,7 @@ 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=BB6R74YhUmoPWg2dYz2gTIM0CE7sMcOt0dsgqEEPza4,174
-dmart_migrations/__pycache__/env.cpython-314.pyc,sha256=9L-2pPlUSIrHh1JLQilY0TDxqo7_ikqfKhFwImuCuwk,3935
+dmart_migrations/__pycache__/env.cpython-314.pyc,sha256=27dvi9nRTOIogSJ7ytGX2i1CbTEw4rwPaZV_OGS175g,4278
 dmart_migrations/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dmart_migrations/scripts/calculate_checksums.py,sha256=v2NLEvReA9V3noJE-BWANgKDdhc8Mqg1ZmJJ8nc8sGI,3443
 dmart_migrations/scripts/migration_f7a4949eed19.py,sha256=oUXuxjU4MbVafm4S-xu5J_4apHqW6hQZ8ftpJtCtM28,1462
@@ -215,7 +215,7 @@ dmart_migrations/versions/__pycache__/8640dcbebf85_add_notes_to_users.cpython-31
 dmart_migrations/versions/__pycache__/91c94250232a_adding_fk_on_owner_shortname.cpython-314.pyc,sha256=IIEupLleN5nEUUpTCXWGV-LXsdzGJrcnrolJmpi8WMo,6383
 dmart_migrations/versions/__pycache__/98ecd6f56f9a_ext_meta_with_owner_group_shortname.cpython-314.pyc,sha256=tPXDQ_TCEK9sv3ZinAk9vUJcwuqE75ymoT_0O_0qLss,5657
 dmart_migrations/versions/__pycache__/9aae9138c4ef_indexing_created_at_updated_at.cpython-314.pyc,sha256=D3m2fuhNbUUNZi21p45UDy8uUmAOio1RZzqoPnKD6G4,6990
-dmart_migrations/versions/__pycache__/b53f916b3f6d_json_to_jsonb.cpython-314.pyc,sha256=tsx4FNUeGpuqnMm_ewhDnjXGdBOzypSVqo_AQtzoOVk,34026
+dmart_migrations/versions/__pycache__/b53f916b3f6d_json_to_jsonb.cpython-314.pyc,sha256=eBvU5VFctw1AqklCtprJJhvGXZVYpvxBcuZiI6bOBGY,34035
 dmart_migrations/versions/__pycache__/eb5f1ec65156_adding_user_locked_to_device.cpython-314.pyc,sha256=v47hBAxgbjkSAsEn8O2EUTUOPR0D9bVD8fJl9erlpzM,2514
 dmart_migrations/versions/__pycache__/f7a4949eed19_adding_query_policies_to_meta.cpython-314.pyc,sha256=jCW56_bq_qQM6H9CjPu2qOm8gywSO7TEHHywlyv1qcI,5099
 languages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.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-1.4.15.dist-info/METADATA,sha256=24CUQVxx3UY6pxDWKIYTH6BfPkcn6CdliEgXpH77ohI,2069
+dmart-1.4.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.15.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
+dmart-1.4.15.dist-info/top_level.txt,sha256=XELQhaIfj-qupnyBrir39qFRh8ncu1RXkCHeitzqLLg,275
+dmart-1.4.15.dist-info/RECORD,,

dmart.py

@@ -537,9 +537,9 @@ def main():
             pkg_dir = Path(__file__).resolve().parent
             
             # Try to find migrations directory
-            # 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():
+                # Fallback to alembic for backward compatibility
                 alembic_dir = pkg_dir / "alembic"
             
             original_ini_path = pkg_dir / "alembic.ini"
@@ -550,51 +550,20 @@ def main():
                 print(f"Error: 'alembic.ini' not found in {pkg_dir} or {alembic_dir}")
                 sys.exit(1)
 
-            # Use subprocess to run alembic to avoid shadowing issues in the current process.
-            # We use the current python executable to ensure we use the same environment.
-            env = os.environ.copy()
-            python_path = env.get("PYTHONPATH", "")
-            if python_path:
-                env["PYTHONPATH"] = f"{pkg_dir}{os.pathsep}{python_path}"
-            else:
-                env["PYTHONPATH"] = str(pkg_dir)
-
             try:
-                # Check if alembic is installed
-                check = subprocess.run(
-                    [sys.executable, "-c", "import alembic"],
-                    capture_output=True,
-                    env=env
-                )
-                if check.returncode != 0:
+                # Check if alembic library is installed
+                try:
+                    from alembic.config import Config
+                    from alembic import command
+                except ImportError:
                     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
-                # Create a temporary alembic.ini to override script_location if needed
-                with tempfile.NamedTemporaryFile(mode='w', suffix='.ini', delete=False) as tf:
-                    with open(original_ini_path, 'r') as f:
-                        content = f.read()
-                    
-                    # Ensure script_location points to the actual directory (absolute path)
-                    import re
-                    content = re.sub(r'^script_location\s*=.*$', f'script_location = {alembic_dir.as_posix()}', content, flags=re.MULTILINE)
-                    tf.write(content)
-                    temp_ini_path = tf.name
+                alembic_cfg = Config(str(original_ini_path))
+                alembic_cfg.set_main_option("script_location", alembic_dir.as_posix())
 
-                try:
-                    result = subprocess.run(
-                        [sys.executable, "-m", "alembic", "-c", temp_ini_path, "upgrade", "head"],
-                        cwd=pkg_dir,
-                        env=env
-                    )
-                    if result.returncode != 0:
-                        sys.exit(result.returncode)
-                finally:
-                    if os.path.exists(temp_ini_path):
-                        os.unlink(temp_ini_path)
+                # Run alembic upgrade head
+                command.upgrade(alembic_cfg, "head")
 
             except Exception as e:
                 print(f"Error running migration: {e}")