Skip to content

Commit 17f57ef

Browse files
authored
Merge pull request #2853 from pygame-community/ankith26-use-makeref
Deprecate `setup.py docs`, make docs in meson build
2 parents 6df3c15 + c7878b1 commit 17f57ef

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+67
-61
lines changed

.circleci/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
- CIBW_SKIP: '*-musllinux_*'
3535
- CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014_base_aarch64
3636
- CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: manylinux2014_base_aarch64
37-
- CIBW_BEFORE_BUILD: pip install Sphinx"<7.2.0" && python setup.py docs
3837
- CIBW_TEST_COMMAND: python -m pygame.tests -v --exclude opengl,music,timing --time_out 300
3938
- CIBW_BUILD_VERBOSITY: 2
4039

.github/workflows/build-debian-multiarch.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ jobs:
100100
# (done for optimization reasons)
101101
run: |
102102
echo "\nBuilding pygame wheel\n"
103-
python3 setup.py docs
104103
pip3 wheel . --no-build-isolation --wheel-dir /artifacts -vvv
105104
echo "\nInstalling wheel\n"
106105
pip3 install --no-index --pre --break-system-packages --find-links /artifacts pygame-ce

.github/workflows/build-macos.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ jobs:
152152
bash ./install_mac_deps.sh
153153
154154
CIBW_BEFORE_BUILD: |
155-
pip install numpy Sphinx"<7.2.0"
156-
python setup.py docs
155+
pip install numpy
157156
cp -r ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }} ${{ github.workspace }}/pygame_mac_deps
158157
159158
# To remove any speculations about the wheel not being self-contained

.github/workflows/build-manylinux.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ jobs:
6060
# skip musllinux for now
6161
CIBW_SKIP: '*-musllinux_*'
6262

63-
# command that runs before every build
64-
CIBW_BEFORE_BUILD: |
65-
pip install Sphinx"<7.2.0"
66-
python setup.py docs
67-
6863
CIBW_TEST_COMMAND: python -m pygame.tests -v --exclude opengl,music,timing --time_out 300
6964

7065
# To 'solve' this issue:

.github/workflows/build-on-msys2.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ jobs:
7272

7373
- name: Building pygame wheel
7474
run: |
75-
python3 setup.py docs
7675
pip3 wheel . --wheel-dir /artifacts -vvv --no-build-isolation
7776
7877
- name: Installing wheel

.github/workflows/build-ubuntu-sdist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
6767
- name: Make sdist and install it
6868
run: |
69-
python3 setup.py docs
69+
python3 buildconfig/make_docs.py
7070
python3 setup.py sdist
7171
pip3 install dist/pygame-*.tar.gz -vv
7272

.github/workflows/build-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
CIBW_BUILD: ${{ matrix.pyversions }}
133133
CIBW_ARCHS: ${{ matrix.winarch }}
134134

135-
CIBW_BEFORE_BUILD: pip install numpy Sphinx"<7.2.0" && python setup.py docs
135+
CIBW_BEFORE_BUILD: pip install numpy
136136

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

.github/workflows/format-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ jobs:
5050

5151
- name: Check docs changes are checked in
5252
run: |
53-
python3 setup.py docs
53+
python3 buildconfig/make_docs.py
5454
if [[ `git status --porcelain` ]]; then
5555
echo "Generating docs caused changes. Please check them in."
56-
echo "You may need to run: python3 setup.py docs --fullgeneration"
56+
echo "You may need to run: python3 buildconfig/make_docs.py full_generation"
5757
# Run git status again, so people can see what changed.
5858
git status --porcelain
5959
exit 1

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# macOS generated files
1212
.DS_Store
1313

14-
# Sphinx generated files: makeref.py
14+
# Sphinx generated files: make_docs.py
1515
/docs/generated
1616

1717
# Emacs temporary files
File renamed without changes.

0 commit comments

Comments
 (0)