Skip to content

Commit

Permalink
Drop python 3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
ankith26 committed Oct 2, 2023
1 parent eaeadb0 commit cc1a1b4
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 37 deletions.
7 changes: 2 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,12 @@ jobs:
environment:
# these environment variables will be passed to the docker container
- CIBW_ENVIRONMENT: PIP_CONFIG_FILE=buildconfig/pip_config.ini PORTMIDI_INC_PORTTIME=1 SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk
- CIBW_BUILD: "cp3{[7-9],10,11,12}-* pp3{[8-9],10}-*"
- CIBW_BUILD: "cp3{8,9,10,11,12}-* pp3{8,9,10}-*"
- CIBW_ARCHS: aarch64
- CIBW_SKIP: '*-musllinux_*'
- CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014_base_aarch64
- CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: manylinux2014_base_aarch64
# urllib3 2.0.0+ needs a newer OpenSSL version than what the python 3.7 build in
# the image has. So downgrade urllib3 for now, until we drop python 3.7 (after
# which there will be no need to downgrade)
- CIBW_BEFORE_BUILD: pip install Sphinx"<7.2.0" urllib3"<2.0.0" && python setup.py docs
- CIBW_BEFORE_BUILD: pip install Sphinx"<7.2.0" && python setup.py docs
- CIBW_TEST_COMMAND: python -m pygame.tests -v --exclude opengl,music,timing --time_out 300
- CIBW_BUILD_VERBOSITY: 2

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ assignees: ''
You can get some of this info from the text that pops up in the console when you run a pygame program.

- **Operating system** (e.g. Windows, Linux(Debian), Linux(Ubuntu), Mac):
- **Python version** (e.g. 3.7.9, 3.8.5) :
- **Python version** (e.g. 3.11.1, 3.8.5) :
- **SDL version** (e.g. SDL 2.0.12):
- **PyGame version** (e.g. 2.0.0.dev10, 1.9.6):
- **Relevant hardware** (e.g. if reporting a bug about a controller, tell us the brand & name of it):
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ jobs:
}

- {
name: "x86_64 (CPython 3.7 and Python 3.8)",
name: "x86_64 (Python 3.8)",
macarch: x86_64,
# CPython 3.7, CPython/PyPy 3.8
pyversions: "cp37-* ?p38-*",
# CPython/PyPy 3.8
pyversions: "?p38-*",
}

- {
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/build-manylinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,15 @@ jobs:
# also define environment variables needed for testing
CIBW_ENVIRONMENT: PIP_CONFIG_FILE=buildconfig/pip_config.ini PORTMIDI_INC_PORTTIME=1 SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk

CIBW_BUILD: "cp3{[7-9],10,11,12}-* pp3{[8-9],10}-*"
CIBW_BUILD: "cp3{8,9,10,11,12}-* pp3{8,9,10}-*"
CIBW_ARCHS: ${{ matrix.arch }}

# skip musllinux for now
CIBW_SKIP: '*-musllinux_*'

# command that runs before every build
# urllib3 2.0.0+ needs a newer OpenSSL version than what the python 3.7 build in
# the image has. So downgrade urllib3 for now, until we drop python 3.7 (after
# which there will be no need to downgrade)
CIBW_BEFORE_BUILD: |
pip install Sphinx"<7.2.0" urllib3"<2.0.0"
pip install Sphinx"<7.2.0"
python setup.py docs
CIBW_TEST_COMMAND: python -m pygame.tests -v --exclude opengl,music,timing --time_out 300
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,6 @@ jobs:
msvc-dev-arch: x86_amd64,
pyversions: "cp38-*"
}
- {
name: "CPython 3.7 (64 bit)",
winarch: AMD64,
msvc-dev-arch: x86_amd64,
pyversions: "cp37-*"
}
- {
name: "CPython 3.12 (32 bit)",
winarch: x86,
Expand Down Expand Up @@ -109,12 +103,6 @@ jobs:
msvc-dev-arch: x86,
pyversions: "cp38-win32"
}
- {
name: "CPython 3.7 (32 bit)",
winarch: x86,
msvc-dev-arch: x86,
pyversions: "cp37-win32"
}
- {
name: "Pypy 3.8",
winarch: AMD64,
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Dependency versions:


+----------+------------------------+
| CPython | >= 3.7 (Or use PyPy3) |
| CPython | >= 3.8 (Or use PyPy3) |
+----------+------------------------+
| SDL | >= 2.0.9 |
+----------+------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/readmes/README.es.rst
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ El módulo surfarray necesita el paquete python numpy, para sus matrices numéri
Versiones de dependencia:

+----------+-----------------------------+
| CPython | >= 3.7 (Ou utiliser PyPy3) |
| CPython | >= 3.8 (Ou utiliser PyPy3) |
+----------+-----------------------------+
| SDL | >= 2.0.9 |
+----------+-----------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/readmes/README.fa.rst
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ Dependencies (وابستگی ها)
مشاهده کنید.

+----------+------------------------+
| CPython | >= 3.7 (Or use PyPy3) |
| CPython | >= 3.8 (Or use PyPy3) |
+----------+------------------------+
| SDL | >= 2.0.9 |
+----------+------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/readmes/README.fr.rst
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ multidimensionnels.
Versions des dépendances:

+----------+-----------------------------+
| CPython | >= 3.7 (Ou utiliser PyPy3) |
| CPython | >= 3.8 (Ou utiliser PyPy3) |
+----------+-----------------------------+
| SDL | >= 2.0.9 |
+----------+-----------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/readmes/README.zh-cn.rst
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ pygame显然依赖于SDL和Python。此外pygame还嵌入了几个较小的库


+----------+------------------------+
| CPython | >= 3.7 (或 PyPy3) |
| CPython | >= 3.8 (或 PyPy3) |
+----------+------------------------+
| SDL | >= 2.0.9 |
+----------+------------------------+
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox:tox]
envlist = py{37,38,39,310,311}
envlist = py{38,39,310,311,312}
skip_missing_interpreters = True
skipsdist = True

Expand Down
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"Programming Language :: Objective C",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand All @@ -61,7 +60,7 @@
"Operating System :: MacOS",
"Typing :: Typed"
],
"python_requires": '>=3.7',
"python_requires": '>=3.8',
}

import re
Expand Down Expand Up @@ -154,11 +153,11 @@ def compilation_help():
print('---\n')


if not hasattr(sys, 'version_info') or sys.version_info < (3, 7):
if not hasattr(sys, 'version_info') or sys.version_info < (3, 8):
compilation_help()
raise SystemExit("Pygame-ce requires Python3 version 3.7 or above.")
raise SystemExit("Pygame-ce requires Python3 version 3.8 or above.")
if IS_PYPY and sys.pypy_version_info < (7,):
raise SystemExit("Pygame-ce requires PyPy version 7.0.0 above, compatible with CPython >= 3.7")
raise SystemExit("Pygame-ce requires PyPy version 7.0.0 above, compatible with CPython >= 3.8")


def consume_arg(name):
Expand Down

0 comments on commit cc1a1b4

Please sign in to comment.