morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

setup.py: fix setuptools>=61 compatibility

Browse Source 
Closes ArchipelagoMW/Archipelago#391
This commit is contained in:
black-sliver
2022-06-16 21:13:45 +02:00
committed by Fabian Dill
parent 26c027a075
commit 2045905c9b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@@ -23,7 +23,7 @@ jobs:
Expand-Archive -Path enemizer.zip -DestinationPath EnemizerCLI -Force Expand-Archive -Path enemizer.zip -DestinationPath EnemizerCLI -Force
- name: Build - name: Build
run: | run: |
python -m pip install --upgrade pip setuptools==60.10.0 # 61 does not work with the current layout python -m pip install --upgrade pip setuptools
pip install -r requirements.txt pip install -r requirements.txt
python setup.py build --yes python setup.py build --yes
$NAME="$(ls build)".Split('.',2)[1] $NAME="$(ls build)".Split('.',2)[1]
@@ -72,7 +72,7 @@ jobs:
- name: Build - name: Build
run: | run: |
# pygobject is an optional dependency for kivy that's not in requirements # pygobject is an optional dependency for kivy that's not in requirements
"${{ env.PYTHON }}" -m pip install --upgrade pip virtualenv PyGObject setuptools==60.10.0 # setuptools same as windows "${{ env.PYTHON }}" -m pip install --upgrade pip virtualenv PyGObject setuptools
"${{ env.PYTHON }}" -m venv venv "${{ env.PYTHON }}" -m venv venv
source venv/bin/activate source venv/bin/activate
pip install -r requirements.txt pip install -r requirements.txt

1
setup.py
View File

@@ -408,6 +408,7 @@ cx_Freeze.setup(
version=f"{version_tuple.major}.{version_tuple.minor}.{version_tuple.build}", version=f"{version_tuple.major}.{version_tuple.minor}.{version_tuple.build}",
description="Archipelago", description="Archipelago",
executables=exes, executables=exes,
ext_modules=[], # required to disable auto-discovery with setuptools>=61
options={ options={
"build_exe": { "build_exe": {
"packages": ["websockets", "worlds", "kivy"], "packages": ["websockets", "worlds", "kivy"],