Skip to content

Commit

Permalink
Revert previous commit - was pushed accidentally
Browse files Browse the repository at this point in the history
This reverts commit cf03be8.
  • Loading branch information
ankith26 committed May 13, 2024
1 parent cf03be8 commit 0f46842
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 12 deletions.
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 buildconfig/makeref.py
- 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/workflows/build-debian-multiarch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
# (done for optimization reasons)
run: |
echo "\nBuilding pygame wheel\n"
python3 buildconfig/makeref.py
python3 setup.py docs
pip3 wheel . --no-build-isolation --wheel-dir /artifacts -vvv
echo "\nInstalling wheel\n"
pip3 install --no-index --pre --break-system-packages --find-links /artifacts pygame-ce
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
CIBW_BEFORE_BUILD: |
pip install numpy Sphinx"<7.2.0"
python buildconfig/makeref.py
python setup.py docs
cp -r ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }} ${{ github.workspace }}/pygame_mac_deps
# To remove any speculations about the wheel not being self-contained
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-manylinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
# command that runs before every build
CIBW_BEFORE_BUILD: |
pip install Sphinx"<7.2.0"
python buildconfig/makeref.py
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-on-msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:

- name: Building pygame wheel
run: |
python3 buildconfig/makeref.py
python3 setup.py docs
pip3 wheel . --wheel-dir /artifacts -vvv --no-build-isolation
- name: Installing wheel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-ubuntu-sdist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Make sdist and install it
run: |
python3 buildconfig/makeref.py
python3 setup.py docs
python3 setup.py sdist
pip3 install dist/pygame-*.tar.gz -vv
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
CIBW_BUILD: ${{ matrix.pyversions }}
CIBW_ARCHS: ${{ matrix.winarch }}

CIBW_BEFORE_BUILD: pip install numpy Sphinx"<7.2.0" && python buildconfig/makeref.py
CIBW_BEFORE_BUILD: pip install numpy Sphinx"<7.2.0" && python setup.py docs

CIBW_TEST_COMMAND: python -m pygame.tests -v --exclude opengl,timing --time_out 300

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/format-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ jobs:

- name: Check docs changes are checked in
run: |
python3 buildconfig/makeref.py
python3 setup.py docs
if [[ `git status --porcelain` ]]; then
echo "Generating docs caused changes. Please check them in."
echo "You may need to run: python3 buildconfig/makeref.py fullgeneration"
echo "You may need to run: python3 setup.py docs --fullgeneration"
# Run git status again, so people can see what changed.
git status --porcelain
exit 1
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 @@ -42,7 +42,7 @@ for PYVER in $SUPPORTED_PYTHONS; do

${PYTHON} -m pip install Sphinx
cd io
${PYTHON} buildconfig/makeref.py
${PYTHON} setup.py docs
cd ..
${PYTHON} -m pip wheel --global-option="build_ext" --global-option="-j4" -vvv /io/ -w wheelhouse/
done
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ but the documentation can also be launched with `python -m pygame.docs`
Steps:
- Install Sphinx (`pip install Sphinx`)
- Fork the pygame-ce repository, download and navigate to it in the terminal
- Run `python buildconfig/makeref.py`
- Run `python setup.py docs`

This will create a new folder under the `docs` folder.
In `docs/generated`, you will find a local copy of the pygame documentation.
Expand Down
2 changes: 1 addition & 1 deletion src_c/doc/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ These files are generated from the rst files in docs/reST/ref/

Both the .rst file and the generated .h file should be committed.

To generate docs run: python buildconfig/makeref.py
To generate docs run: python setup.py docs

0 comments on commit 0f46842

Please sign in to comment.