Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-16 15:50:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #99134 from Repiteo/scons/bump-scons-python

Browse Source 
SCons: Bump minimum version of SCons to 4.0 & Python to 3.8
This commit is contained in:
Thaddeus Crews 2024-11-13 08:34:08 -06:00
commit 06d2ec4422
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
5 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/actions/godot-deps/action.yml vendored
View File

@ -27,6 +27,5 @@ runs:
shell: bash shell: bash
run: | run: |
python -c "import sys; print(sys.version)" python -c "import sys; print(sys.version)"
python -m pip install wheel
python -m pip install scons==${{ inputs.scons-version }} python -m pip install scons==${{ inputs.scons-version }}
scons --version scons --version

10
.github/workflows/linux_builds.yml vendored
View File

@ -17,8 +17,8 @@ concurrency:
jobs: jobs:
build-linux: build-linux:
# If unspecified, stay one LTS before latest to increase portability of Linux artifacts. # Stay one LTS before latest to increase portability of Linux artifacts.
runs-on: ${{ matrix.os || 'ubuntu-22.04' }} runs-on: ubuntu-22.04
name: ${{ matrix.name }} name: ${{ matrix.name }}
strategy: strategy:
fail-fast: false fail-fast: false
@ -61,8 +61,6 @@ jobs:
artifact: false artifact: false
# Test our oldest supported SCons/Python versions on one arbitrary editor build. # Test our oldest supported SCons/Python versions on one arbitrary editor build.
legacy-scons: true legacy-scons: true
# Python 3.6 unavailable on 22.04.
os: ubuntu-20.04
- name: Editor with ThreadSanitizer (target=editor, tests=yes, dev_build=yes, use_tsan=yes, use_llvm=yes, linker=lld) - name: Editor with ThreadSanitizer (target=editor, tests=yes, dev_build=yes, use_tsan=yes, use_llvm=yes, linker=lld)
cache-name: linux-editor-thread-sanitizer cache-name: linux-editor-thread-sanitizer
@ -132,8 +130,8 @@ jobs:
uses: ./.github/actions/godot-deps uses: ./.github/actions/godot-deps
with: with:
# Sync with Ensure*Version in SConstruct. # Sync with Ensure*Version in SConstruct.
python-version: 3.6 python-version: 3.8
scons-version: 3.1.2 scons-version: 4.0
- name: Setup GCC problem matcher - name: Setup GCC problem matcher
uses: ammaraskar/gcc-problem-matcher@master uses: ammaraskar/gcc-problem-matcher@master

11
SConstruct
View File

@ -1,8 +1,8 @@
#!/usr/bin/env python #!/usr/bin/env python
from misc.utility.scons_hints import * from misc.utility.scons_hints import *
EnsureSConsVersion(3, 1, 2) EnsureSConsVersion(4, 0)
EnsurePythonVersion(3, 6) EnsurePythonVersion(3, 8)
# System # System
import atexit import atexit
@ -1060,13 +1060,6 @@ if env["vsproj"]:
env.vs_srcs = [] env.vs_srcs = []
if env["compiledb"]: if env["compiledb"]:
if env.scons_version < (4, 0, 0):
# Generating the compilation DB (`compile_commands.json`) requires SCons 4.0.0 or later.
print_error(
"The `compiledb=yes` option requires SCons 4.0 or later, but your version is %s." % scons_raw_version
)
Exit(255)
env.Tool("compilation_db") env.Tool("compilation_db")
env.Alias("compiledb", env.CompilationDatabase()) env.Alias("compiledb", env.CompilationDatabase())

1
methods.py
View File

@ -409,7 +409,6 @@ def use_windows_spawn_fix(self, platform=None):
"shell": False, "shell": False,
"env": env, "env": env,
} }
if sys.version_info >= (3, 7, 0):
popen_args["text"] = True popen_args["text"] = True
proc = subprocess.Popen(cmdline, **popen_args) proc = subprocess.Popen(cmdline, **popen_args)
_, err = proc.communicate() _, err = proc.communicate()

2
pyproject.toml
View File

@ -16,7 +16,7 @@ python_version = "3.8"
extend-exclude = ["thirdparty"] extend-exclude = ["thirdparty"]
extend-include = ["SConstruct", "SCsub"] extend-include = ["SConstruct", "SCsub"]
line-length = 120 line-length = 120
target-version = "py37" target-version = "py38"
[tool.ruff.lint] [tool.ruff.lint]
extend-select = [ extend-select = [