dmart 1.4.24__py3-none-any.whl → 1.4.26__py3-none-any.whl

{dmart-1.4.24.dist-info → dmart-1.4.26.dist-info}/METADATA

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

{dmart-1.4.24.dist-info → dmart-1.4.26.dist-info}/RECORD

@@ -1,8 +1,7 @@
 bundler.py,sha256=MDTUTVS0WL7gb-i1rDcS4i37KTqaW88TluL4L3rwjRw,1817
 data_generator.py,sha256=CnE-VHEeX7-lAXtqCgbRqR9WHjTuOgeiZcviYrHAmho,2287
-dmart.py,sha256=_WzBKm8T24re0R7eofvwAby5mKvrM6V_czFoKjDND-M,25710
+dmart.py,sha256=s56hBfeEOKqdtUosLGi9MY76bRfRLHDvWKXT2i_Y8qw,23689
 get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
-info.json,sha256=hXQWl19lfMkEj_zXdehGeKjiKGNJ7emY4S7d4pIqJ1E,123
 main.py,sha256=KZGhIL6AnEm5ZAPy4IvhBDpzSTjuodilV7NafNOyhzM,19676
 migrate.py,sha256=hn1MZoVby_Jjqhc7y3CrLcGD619QmVZv3PONNvO7VKQ,665
 password_gen.py,sha256=xjx8wi105ZYvhLBBQj7_rugACpxifGXHse6f7YlGXWQ,196
@@ -272,8 +271,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.24.dist-info/METADATA,sha256=HuxMQT5rahipsbnnlneZantm6I-S6UR_wy5kwxEZDMw,2149
-dmart-1.4.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dmart-1.4.24.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
-dmart-1.4.24.dist-info/top_level.txt,sha256=S-gfX1pLerapNXiHZ8lvPYoV7sgwSX2_NCZ6xfzDUHM,267
-dmart-1.4.24.dist-info/RECORD,,
+dmart-1.4.26.dist-info/METADATA,sha256=qhwJ1zV-khUXfFD7kr6-z-m-iqg_yR2YnJPqH0Rh0gE,2149
+dmart-1.4.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.26.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
+dmart-1.4.26.dist-info/top_level.txt,sha256=S-gfX1pLerapNXiHZ8lvPYoV7sgwSX2_NCZ6xfzDUHM,267
+dmart-1.4.26.dist-info/RECORD,,

dmart.py

@@ -20,28 +20,6 @@ from pathlib import Path
 from hypercorn.config import Config
 from hypercorn.run import run
 
-# Try to import alembic
-try:
-    import alembic
-    # Check if we are importing the local alembic directory which is likely a leftover
-    if hasattr(alembic, '__path__'):
-        local_alembic_path = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'alembic'))
-        for p in alembic.__path__:
-            if os.path.abspath(p) == local_alembic_path:
-                # Check if it is a namespace package (no __init__.py)
-                if not os.path.exists(os.path.join(p, '__init__.py')):
-                    # It is a leftover directory
-                    try:
-                        shutil.rmtree(p)
-                        # Force reload
-                        if 'alembic' in sys.modules:
-                            del sys.modules['alembic']
-                        import alembic
-                    except Exception:
-                        pass
-except ImportError:
-    pass
-
 try:
     from alembic import command as alembic_command
     from alembic.config import Config as AlembicConfig
@@ -578,42 +556,23 @@ def main():
                 # Fallback to alembic for backward compatibility
                 alembic_dir = pkg_dir / "alembic"
             
-            original_ini_path = pkg_dir / "dmart_migrations" / "alembic.ini"
-            if not original_ini_path.exists():
-                original_ini_path = alembic_dir / "alembic.ini"
+            # Look for alembic.ini in the package directory or migrations directory
+            ini_path = pkg_dir / "alembic.ini"
+            if not ini_path.exists():
+                ini_path = alembic_dir / "alembic.ini"
             
-            if not original_ini_path.exists():
+            if not ini_path.exists():
                 print(f"Error: 'alembic.ini' not found in {pkg_dir} or {alembic_dir}")
                 sys.exit(1)
 
             try:
                 # Check if alembic library is installed
                 if not HAS_ALEMBIC:
-                    print("Warning: 'alembic' library not found. Attempting to run 'alembic' CLI...")
-                    
-                    with tempfile.NamedTemporaryFile(mode='w', suffix='.ini', delete=False) as tmp:
-                        temp_ini_path = tmp.name
-                        config = configparser.ConfigParser()
-                        config.read(str(original_ini_path))
-                        if not config.has_section('alembic'):
-                            config.add_section('alembic')
-                        config.set('alembic', 'script_location', alembic_dir.as_posix())
-                        config.write(tmp)
-                    
-                    try:
-                        subprocess.run([sys.executable, "-m", "alembic", "-c", temp_ini_path, "upgrade", "head"], check=True)
-                    except Exception as e:
-                        print(f"Error running alembic CLI: {e}")
-                        print("Please install 'alembic' library with 'pip install alembic'.")
-                        if ALEMBIC_ERROR:
-                            print(f"Details: {ALEMBIC_ERROR}")
-                        sys.exit(1)
-                    finally:
-                        if os.path.exists(temp_ini_path):
-                            os.unlink(temp_ini_path)
-                    return
-
-                alembic_cfg = AlembicConfig(str(original_ini_path))
+                    print(f"Error: 'alembic' library not found. {ALEMBIC_ERROR}")
+                    print("Please install 'alembic' library with 'pip install alembic'.")
+                    sys.exit(1)
+
+                alembic_cfg = AlembicConfig(str(ini_path))
                 alembic_cfg.set_main_option("script_location", alembic_dir.as_posix())
 
                 # Run alembic upgrade head

info.json

@@ -1 +0,0 @@
-{"branch": "pypi", "version": "2e6304dd", "tag": "v1.4.0-72-g2e6304dd", "version_date": "'Mon Jan 19 08:55:04 2026 +0000'"}