Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Requirements dev file #2699

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- CIBW_SKIP: '*-musllinux_*'
- CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014_base_aarch64
- CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: manylinux2014_base_aarch64
- CIBW_BEFORE_BUILD: pip install Sphinx"<7.2.0" && python setup.py docs
- CIBW_BEFORE_BUILD: pip install -r requirements-dev.txt && 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
20 changes: 10 additions & 10 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: macOS

# Run CI only when a release is created, on changes to main branch, or any PR
# to main. Do not run CI on any other branch. Also, skip any non-source changes
# Run CI only when a release is created, on changes to main branch, or any PR
# to main. Do not run CI on any other branch. Also, skip any non-source changes
# from running on CI
on:
push:
Expand All @@ -27,7 +27,7 @@ on:
- '.github/workflows/*.yml'
# re-include current file to not be excluded
- '!.github/workflows/build-macos.yml'

# the github release drafter can call this workflow
workflow_call:

Expand All @@ -54,7 +54,7 @@ jobs:
uses: actions/[email protected]
with:
path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
# The hash of all files in buildconfig manylinux-build and macdependencies is
# The hash of all files in buildconfig manylinux-build and macdependencies is
# the key to the cache. If anything changes here, the deps are built again
key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }}-${{ matrix.os }}
lookup-only: true
Expand Down Expand Up @@ -86,36 +86,36 @@ jobs:
# builds on macOS. This needs to be manually kept updated so that each
# of these builds take roughly the same time
include:
- {
- {
name: "x86_64 (CPython 3.9 - 3.12)",
macarch: x86_64,
os: macos-13,
pyversions: "cp3{9,10,11,12}-*",
}

- {
- {
name: "x86_64 (Python 3.8)",
macarch: x86_64,
os: macos-13,
# CPython/PyPy 3.8
pyversions: "?p38-*",
}

- {
- {
name: "x86_64 (PyPy 3.9 and 3.10)",
macarch: x86_64,
os: macos-13,
pyversions: "pp39-* pp310-*",
}

- {
- {
name: "arm64 (CPython 3.8 - 3.10)",
macarch: arm64,
os: macos-14,
pyversions: "cp3{8,9,10}-*",
}

- {
- {
name: "arm64 (CPython 3.11 - 3.12)",
macarch: arm64,
os: macos-14,
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
bash ./install_mac_deps.sh

CIBW_BEFORE_BUILD: |
pip install numpy Sphinx"<7.2.0"
pip install -r requirements-dev.txt
python setup.py docs
cp -r ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }} ${{ github.workspace }}/pygame_mac_deps

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build-manylinux.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: ManyLinux

# Run CI only when a release is created, on changes to main branch, or any PR
# to main. Do not run CI on any other branch. Also, skip any non-source changes
# Run CI only when a release is created, on changes to main branch, or any PR
# to main. Do not run CI on any other branch. Also, skip any non-source changes
# from running on CI
on:
push:
Expand All @@ -27,7 +27,7 @@ on:
- '.github/workflows/*.yml'
# re-include current file to not be excluded
- '!.github/workflows/build-manylinux.yml'

# the github release drafter can call this workflow
workflow_call:

Expand All @@ -42,12 +42,12 @@ jobs:
permissions:
contents: read
packages: write

strategy:
fail-fast: false # if a particular matrix build fails, don't skip the rest
matrix:
arch: [x86_64, i686]

env:
# load pip config from this file. Define this in 'CIBW_ENVIRONMENT'
# because this should not affect cibuildwheel machinery
Expand All @@ -62,7 +62,7 @@ jobs:

# command that runs before every build
CIBW_BEFORE_BUILD: |
pip install Sphinx"<7.2.0"
pip install -r requirements-dev.txt
python setup.py docs

CIBW_TEST_COMMAND: python -m pygame.tests -v --exclude opengl,music,timing --time_out 300
Expand All @@ -87,7 +87,7 @@ jobs:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Inspect image, skip build if image exists
id: inspect
continue-on-error: true
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-ubuntu-sdist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

name: Ubuntu sdist

# Run CI only when a release is created, on changes to main branch, or any PR
# to main. Do not run CI on any other branch. Also, skip any non-source changes
# Run CI only when a release is created, on changes to main branch, or any PR
# to main. Do not run CI on any other branch. Also, skip any non-source changes
# from running on CI
on:
push:
Expand All @@ -34,7 +34,7 @@ on:
- '.github/workflows/*.yml'
# re-include current file to not be excluded
- '!.github/workflows/build-ubuntu-sdist.yml'

# the github release drafter can call this workflow
workflow_call:

Expand All @@ -44,7 +44,7 @@ concurrency:

jobs:
build:
runs-on: ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false # if a particular matrix build fails, don't skip the rest
matrix:
Expand All @@ -61,8 +61,8 @@ jobs:
run: |
sudo apt-get update --fix-missing
sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev python3-setuptools python3-dev
pip3 install --upgrade pip
pip3 install sphinx"<7.2.0" numpy>=1.21.0
pip3 install -r requirements-dev.txt

- name: Make sdist and install it
run: |
Expand All @@ -75,7 +75,7 @@ jobs:
SDL_VIDEODRIVER: "dummy"
SDL_AUDIODRIVER: "disk"
run: python3 -m pygame.tests -v --exclude opengl,music,timing --time_out 300

- name: Test typestubs
if: matrix.os == 'ubuntu-22.04' # run stubtest only once
run: |
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
name: Windows

# Run CI only when a release is created, on changes to main branch, or any PR
# to main. Do not run CI on any other branch. Also, skip any non-source changes
Expand Down Expand Up @@ -27,7 +26,7 @@ on:
- '.github/workflows/*.yml'
# re-include current file to not be excluded
- '!.github/workflows/build-windows.yml'

# the github release drafter can call this workflow
workflow_call:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- uses: actions/[email protected]

- name: Install deps
run: python3 -m pip install pylint sphinx"<7.2.0"
run: python3 -m pip install -r requirements-dev.txt

- name: Check code linting
run: pylint src_py docs
Expand Down
2 changes: 1 addition & 1 deletion buildconfig/manylinux-build/build-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ for PYVER in $SUPPORTED_PYTHONS; do
PYTHON="/opt/python/${PYVER}/bin/pypy"
fi

${PYTHON} -m pip install Sphinx
${PYTHON} -m pip install -r requirements-dev.txt
cd io
${PYTHON} setup.py docs
cd ..
Expand Down
3 changes: 3 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
numpy
pylint<=3.1.0
meson
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

meson is already covered due to specifying meson-python in [build-system] requires of pyproject.toml, so like the rest it need not be re-specified here.

However, you could specify mypy here instead, it's used by the stubcheck program we have

Loading