diff --git a/backend/tests/migrations/test_wheel_resources.py b/backend/tests/migrations/test_wheel_resources.py index 2c95dfb..6728643 100644 --- a/backend/tests/migrations/test_wheel_resources.py +++ b/backend/tests/migrations/test_wheel_resources.py @@ -57,35 +57,80 @@ def test_wheel_contains_and_runs_migrations_outside_source_tree(tmp_path): assert any(name.endswith(resource) for name in names), resource virtualenv = tmp_path / "venv" - subprocess.run( - [ - sys.executable, - "-m", - "venv", - "--system-site-packages", - str(virtualenv), - ], - check=True, - capture_output=True, - text=True, - timeout=60, - ) + try: + subprocess.run( + [ + sys.executable, + "-m", + "venv", + "--system-site-packages", + str(virtualenv), + ], + check=True, + capture_output=True, + text=True, + timeout=60, + ) + has_pip = True + except subprocess.CalledProcessError: + subprocess.run( + [ + sys.executable, + "-m", + "venv", + "--system-site-packages", + "--without-pip", + str(virtualenv), + ], + check=True, + capture_output=True, + text=True, + timeout=60, + ) + has_pip = False + virtualenv_python = virtualenv / "bin" / "python" - subprocess.run( - [ - str(virtualenv_python), - "-m", - "pip", - "install", - "--no-deps", - str(wheel), - ], - env=environment, - check=True, - capture_output=True, - text=True, - timeout=60, - ) + if has_pip: + subprocess.run( + [ + str(virtualenv_python), + "-m", + "pip", + "install", + "--no-deps", + str(wheel), + ], + env=environment, + check=True, + capture_output=True, + text=True, + timeout=60, + ) + else: + subprocess.run( + [ + sys.executable, + "-m", + "pip", + "--python", + str(virtualenv_python), + "install", + "--no-deps", + str(wheel), + ], + env=environment, + check=True, + capture_output=True, + text=True, + timeout=60, + ) + import sysconfig + + parent_site = sysconfig.get_path("purelib") + virtual_site = next(virtualenv.glob("lib/python*/site-packages")) + (virtual_site / "_parent_venv.pth").write_text( + f"{parent_site}\n", encoding="utf-8" + ) database = tmp_path / "installed.db" script = """ from alembic.config import Config diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 444f7c3..62dd2f5 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "meetflow-frontend", - "version": "0.3.1", + "version": "0.3.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "meetflow-frontend", - "version": "0.3.1", + "version": "0.3.2", "dependencies": { "@lucide/vue": "^1.46.0", "@milkdown/crepe": "^7.22.1", diff --git a/frontend/package.json b/frontend/package.json index 357a333..6ae773d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,7 +1,7 @@ { "name": "meetflow-frontend", "private": true, - "version": "0.3.1", + "version": "0.3.2", "type": "module", "scripts": { "dev": "vite --host 0.0.0.0", diff --git a/pyproject.toml b/pyproject.toml index 97ca74d..67af199 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "meetflow" -version = "0.3.1" +version = "0.3.2" requires-python = ">=3.12" dependencies = [ "alembic>=1.20.0,<2",