Skip to content

Commit

Permalink
Update references to setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
AA-Turner committed Aug 28, 2022
1 parent b8b9fb9 commit 055c6c2
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 11 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/docutils-latest.yml
Expand Up @@ -21,8 +21,6 @@ jobs:
python-version: 3
- name: Check Python version
run: python --version
- name: Unpin docutils
run: sed -i -e "s/'docutils>=.*'/'docutils'/" setup.py
- name: Install graphviz
run: sudo apt-get install graphviz
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Expand Up @@ -20,6 +20,6 @@ jobs:
with:
python-version: 3
- name: Install dependencies
run: pip install -U tox
run: python -m pip install -U tox pip
- name: Run Tox
run: tox -e ${{ matrix.tool }}
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -74,7 +74,7 @@ covertest:

.PHONY: build
build:
@$(PYTHON) setup.py build
@$(PYTHON) -m build .

.PHONY: docs
docs:
Expand Down
2 changes: 1 addition & 1 deletion sphinx/__init__.py
@@ -1,7 +1,7 @@
"""The Sphinx documentation toolchain."""

# Keep this file executable as-is in Python 3!
# (Otherwise getting the version out of it from setup.py is impossible.)
# (Otherwise getting the version out of it when packaging is impossible.)

import os
import warnings
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Expand Up @@ -35,7 +35,7 @@ commands=

[testenv:du-latest]
commands =
python -m pip install "git+https://repo.or.cz/docutils.git#subdirectory=docutils"
python -m pip install "git+https://repo.or.cz/docutils.git#subdirectory=docutils" --no-warn-conflicts
{[testenv]commands}

[testenv:flake8]
Expand Down Expand Up @@ -104,8 +104,9 @@ description =
Lint package.
deps =
twine
build
commands =
python setup.py release bdist_wheel sdist
python -m build .
twine check dist/*

[testenv:bindep]
Expand Down
8 changes: 4 additions & 4 deletions utils/release-checklist
Expand Up @@ -10,7 +10,7 @@ for stable releases
* Check diff by ``git diff``
* ``git commit -am 'Bump to X.Y.Z final'``
* ``make clean``
* ``python setup.py release bdist_wheel sdist``
* ``python -m build .``
* ``twine upload dist/Sphinx-* --sign --identity [your GPG key]``
* open https://pypi.org/project/Sphinx/ and check there are no obvious errors
* ``sh utils/bump_docker.sh X.Y.Z``
Expand All @@ -34,7 +34,7 @@ for first beta releases
* Check diff by ``git diff``
* ``git commit -am 'Bump to X.Y.0 beta1'``
* ``make clean``
* ``python setup.py release bdist_wheel sdist``
* ``python -m build .``
* ``twine upload dist/Sphinx-* --sign --identity [your GPG key]``
* open https://pypi.org/project/Sphinx/ and check there are no obvious errors
* ``git tag vX.Y.0b1``
Expand Down Expand Up @@ -62,7 +62,7 @@ for other beta releases
* Check diff by ``git diff``
* ``git commit -am 'Bump to X.Y.0 betaN'``
* ``make clean``
* ``python setup.py release bdist_wheel sdist``
* ``python -m build .``
* ``twine upload dist/Sphinx-* --sign --identity [your GPG key]``
* open https://pypi.org/project/Sphinx/ and check there are no obvious errors
* ``git tag vX.Y.0bN``
Expand All @@ -87,7 +87,7 @@ for major releases
* Check diff by ``git diff``
* ``git commit -am 'Bump to X.Y.0 final'``
* ``make clean``
* ``python setup.py release bdist_wheel sdist``
* ``python -m build .``
* ``twine upload dist/Sphinx-* --sign --identity [your GPG key]``
* open https://pypi.org/project/Sphinx/ and check there are no obvious errors
* ``sh utils/bump_docker.sh X.Y.Z``
Expand Down

0 comments on commit 055c6c2

Please sign in to comment.