Skip to content

Commit 4b42ef4

Browse files
urban233urban233
committed
Update requirements installation paths for OS-specific environments and add requirements.txt
1 parent 73324b8 commit 4b42ef4

File tree

7 files changed

+8
-14
lines changed

7 files changed

+8
-14
lines changed

‎.github/workflows/build_app.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
python -m venv .venv
4141
call .venv\Scripts\activate.bat
4242
python -m pip install --upgrade setuptools pip build
43-
python -m pip install -r requirements.txt
43+
python -m pip install -r ./os_specific/windows/requirements.txt
4444
shell: cmd
4545

4646
- name: Download Inno Setup installer
@@ -101,7 +101,7 @@ jobs:
101101
python -m venv .venv
102102
source .venv/bin/activate
103103
python -m pip install wheel setuptools
104-
python -m pip install -r requirements.txt
104+
python -m pip install -r ./os_specific/macos/requirements.txt
105105
106106
- name: Build app package
107107
run: |
@@ -143,7 +143,7 @@ jobs:
143143
python -m venv .venv
144144
source .venv/bin/activate
145145
python -m pip install wheel setuptools
146-
python -m pip install -r requirements.txt
146+
python -m pip install -r ./os_specific/linux/requirements.txt
147147
148148
- name: Build app package
149149
run: |

‎automations/build_exe.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,5 @@ def setup_based_build(self) -> None:
9696

9797
def build() -> None:
9898
"""Builds the EXE file but based on the setup.py for cx_freeze."""
99-
tmp_build_macos_exe = BuildExe()
100-
tmp_build_macos_exe.setup_based_build()
99+
tmp_builder = BuildExe()
100+
tmp_builder.setup_based_build()

‎automations/const.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ def invalid_platform() -> int:
7575
PROJECT_ROOT_DIR / "os_specific/macos"
7676
)
7777
elif __linux__:
78-
PYMOL_PACKAGE_DIR = "No path set!" # TODO: Add the correct path
78+
PYMOL_PACKAGE_DIR = pathlib.Path(
79+
PROJECT_ROOT_DIR / f".venv/lib/python{PYTHON_VERSION}/site-packages/pymol"
80+
)
7981
OS_SPECIFIC_DIR = pathlib.Path(
8082
PROJECT_ROOT_DIR / "os_specific/linux"
8183
)

requirements.txt renamed to os_specific/linux/requirements.txt

File renamed without changes.

‎os_specific/macos/requirements.txt‎

726 Bytes
Binary file not shown.

‎os_specific/windows/requirements.txt‎

1.33 KB
Binary file not shown.

‎requirements.txt.macos‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)