monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core, CI: Add Python 3.12 support (#3290) 

* Core, CI: add py3.12 compat

* Stardew Valley: Fix tests for Py3.12

* ModuleUpdate: always install pkg_resources

* Docs: update supported python versions

* WebHost: update pony to upstream 0.7.18

* CI: test hosting update to py3.12

* Update docs/running from source.md
This commit is contained in:
black-sliver 2024-09-02 10:08:16 +02:00 committed by GitHub
parent 3ab71daa8d
commit 73701292b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/unittests.yml vendored
View File

@ -37,12 +37,13 @@ jobs:
- {version: '3.9'} - {version: '3.9'}
- {version: '3.10'} - {version: '3.10'}
- {version: '3.11'} - {version: '3.11'}
- {version: '3.12'}
include: include:
- python: {version: '3.8'} # win7 compat - python: {version: '3.8'} # win7 compat
os: windows-latest os: windows-latest
- python: {version: '3.11'} # current - python: {version: '3.12'} # current
os: windows-latest os: windows-latest
- python: {version: '3.11'} # current - python: {version: '3.12'} # current
os: macos-latest os: macos-latest
steps: steps:
@ -70,7 +71,7 @@ jobs:
os: os:
- ubuntu-latest - ubuntu-latest
python: python:
- {version: '3.11'} # current - {version: '3.12'} # current
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

6
ModuleUpdate.py
View File

@ -75,13 +75,13 @@ def update(yes: bool = False, force: bool = False) -> None:
if not update_ran: if not update_ran:
update_ran = True update_ran = True
install_pkg_resources(yes=yes)
import pkg_resources
if force: if force:
update_command() update_command()
return return
install_pkg_resources(yes=yes)
import pkg_resources
prev = "" # if a line ends in \ we store here and merge later prev = "" # if a line ends in \ we store here and merge later
for req_file in requirements_files: for req_file in requirements_files:
path = os.path.join(os.path.dirname(sys.argv[0]), req_file) path = os.path.join(os.path.dirname(sys.argv[0]), req_file)

2
WebHostLib/requirements.txt
View File

@ -1,6 +1,6 @@
flask>=3.0.3 flask>=3.0.3
werkzeug>=3.0.3 werkzeug>=3.0.3
pony>=0.7.17 pony>=0.7.18
waitress>=3.0.0 waitress>=3.0.0
Flask-Caching>=2.3.0 Flask-Caching>=2.3.0
Flask-Compress>=1.15 Flask-Compress>=1.15

4
docs/running from source.md
View File

@ -8,7 +8,7 @@ use that version. These steps are for developers or platforms without compiled r
What you'll need: What you'll need:
* [Python 3.8.7 or newer](https://www.python.org/downloads/), not the Windows Store version * [Python 3.8.7 or newer](https://www.python.org/downloads/), not the Windows Store version
* **Python 3.12 is currently unsupported** * Python 3.12.x is currently the newest supported version
* pip: included in downloads from python.org, separate in many Linux distributions * pip: included in downloads from python.org, separate in many Linux distributions
* Matching C compiler * Matching C compiler
* possibly optional, read operating system specific sections * possibly optional, read operating system specific sections
@ -31,7 +31,7 @@ After this, you should be able to run the programs.
Recommended steps Recommended steps
* Download and install a "Windows installer (64-bit)" from the [Python download page](https://www.python.org/downloads) * Download and install a "Windows installer (64-bit)" from the [Python download page](https://www.python.org/downloads)
* **Python 3.12 is currently unsupported** * [read above](#General) which versions are supported
* **Optional**: Download and install Visual Studio Build Tools from * **Optional**: Download and install Visual Studio Build Tools from
[Visual Studio Build Tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/). [Visual Studio Build Tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/).