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

Revert #2407 #2431

Closed
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
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 Sphinx && 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/workflows/build-macos.yml
Expand Up @@ -147,7 +147,7 @@ jobs:
bash ./install_mac_deps.sh

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-manylinux.yml
Expand Up @@ -62,7 +62,7 @@ jobs:

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

CIBW_TEST_COMMAND: python -m pygame.tests -v --exclude opengl,music,timing --time_out 300
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-ubuntu-sdist.yml
Expand Up @@ -60,7 +60,7 @@ jobs:
sudo apt-get update --fix-missing
sudo apt-get upgrade
sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev libjpeg-dev python3-setuptools python3-dev
pip3 install sphinx"<7.2.0" numpy>=1.21.0
pip3 install sphinx numpy>=1.21.0

- name: Make sdist and install it
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Expand Up @@ -168,7 +168,7 @@ jobs:
run: |
set DISTUTILS_USE_SDK=1
set MSSdk=1
python -m pip install setuptools wheel requests numpy Sphinx"<7.2.0"
python -m pip install setuptools wheel requests numpy Sphinx
python setup.py docs
python -m pip --disable-pip-version-check install cibuildwheel==2.15.0
python -m cibuildwheel --output-dir wheelhouse
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format-lint.yml
Expand Up @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v3.6.0

- name: Install deps
run: python3 -m pip install pylint black clang-format sphinx"<7.2.0"
run: python3 -m pip install pylint black clang-format sphinx

- name: Check code Formatting and Linting
run: python3 setup.py lint
Expand Down