Skip to content

Commit 048dce5

Browse files
update requirements.txt files
I added a complicated system to allow me to have nightly builds (with wmwpy from github) and dist builds (with wmwpy from pypi) while allowing me to update the other dependencies in once place.
1 parent dcb6a1f commit 048dce5

13 files changed

+31
-22
lines changed

.github/workflows/pyinstaller-build-mac.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ jobs:
3232
- name: Install dependencies
3333
run: |
3434
python -m pip install --upgrade pip
35-
pip install pyinstaller
36-
pip install -r requirements.txt
35+
pip install -r requirements/requirements-nightly.txt
3736
3837
- name: pyinstaller build
3938
run: |

.github/workflows/pyinstaller-build-ubuntu.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ jobs:
3333
- name: Install dependencies
3434
run: |
3535
python -m pip install --upgrade pip
36-
pip install pyinstaller
37-
pip install -r requirements.txt
36+
pip install -r requirements/requirements-nightly.txt
3837
3938
- name: pyinstaller build
4039
run: |

.github/workflows/pyinstaller-build-windows.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ jobs:
3232
- name: Install dependencies
3333
run: |
3434
python -m pip install --upgrade pip
35-
pip install pyinstaller
36-
pip install -r requirements.txt
35+
pip install -r requirements/requirements-nightly.txt
3736
3837
- name: pyinstaller build
3938
run: |

.github/workflows/pyinstaller-build.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ jobs:
3232
- name: Install dependencies
3333
run: |
3434
python -m pip install --upgrade pip
35-
pip install pyinstaller
36-
pip install -r requirements.txt
35+
pip install -r requirements/requirements-dist.txt
3736
3837
- name: pyinstaller build
3938
run: |
@@ -79,8 +78,7 @@ jobs:
7978
- name: Install dependencies
8079
run: |
8180
python -m pip install --upgrade pip
82-
pip install pyinstaller
83-
pip install -r requirements.txt
81+
pip install -r requirements/requirements-dist.txt
8482
8583
- name: pyinstaller build
8684
run: |
@@ -128,7 +126,7 @@ jobs:
128126
run: |
129127
python -m pip install --upgrade pip
130128
pip install pyinstaller
131-
pip install -r requirements.txt
129+
pip install -r requirements/requirements-dist.txt
132130
133131
- name: pyinstaller build
134132
run: |

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -168,3 +168,6 @@ android/
168168
# My folder for extracted games
169169
src/game
170170
git_dist/
171+
172+
# my local wmwpy installation
173+
requirements-local.txt

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ This will override your editable installation of wmwpy (in the venv, it will not
103103
pip install -e ../wmwpy
104104
```
105105

106-
You can also edit `requirements.txt` to replace `wmwpy@git+https://github.com/wmw-modding/wmwpy` with `-e "../wmwpy"`, and then you won't have to bother with reinstalling wmwpy, but if you're going to be publishing your edits, you might want to replace it with the link to your wmwpy clone repo instead of a path to your local clone.
106+
(Tip: you can also install `requirements/requirements-build.txt` to only install the build requirements)
107107

108-
Note: you need `requirements.txt` in the same directory, as this `requirements-build.txt` references `requirements.txt`.
108+
You can also edit `requirements.txt` to add `-e "../wmwpy"`, and then you won't have to bother with reinstalling wmwpy, but if you're going to be publishing your edits, you might want to replace it with the link to your wmwpy clone repo instead of a path to your local clone.
109109

110110
### Build exe
111111

requirements-build.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
setuptools
2-
-r requirements.txt
3-
pyinstaller==6.7.0
1+
# building
2+
-r requirements/requirements-nightly.txt

requirements.txt

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
# setuptools
2-
wmwpy@git+https://github.com/wmw-modding/wmwpy
3-
# wmwpy==0.5.2b0
4-
tk==0.1.0
5-
numpy==1.26.4
6-
tkmacosx==1.0.5
1+
-r requirements/requirements-dev.txt

requirements/requirements-build.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# for building
2+
pyinstaller==6.9.0
3+
-r requirements-deps.txt

requirements/requirements-deps.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# main dependencies
2+
setuptools
3+
tk==0.1.0
4+
numpy==2.0.0
5+
tkmacosx==1.0.5

requirements/requirements-dev.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# dev wmwpy
2+
wmwpy@git+https://github.com/wmw-modding/wmwpy
3+
-r requirements-deps.txt

requirements/requirements-dist.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# for releases (wmwpy from pypi)
2+
wmwpy==0.6.0b0
3+
-r requirements-build.txt

requirements/requirements-nightly.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# nightly builds (wmwpy from github)
2+
-r requirements-dev.txt
3+
-r requirements-build.txt

0 commit comments

Comments
 (0)