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.

Sign up for GitHub

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

Jump to bottom

Remove setup.py #757

Merged
merged 7 commits into from
May 29, 2021
Merged

Remove setup.py #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ad0f2bc
Remove setup.py
bhrutledge May 26, 2021
d29d0ea
Use isolated_build for pyproject.toml
bhrutledge May 26, 2021
912602f
Remove 'twine check' from docs build
bhrutledge May 26, 2021
6a22c86
Add 'twine check' to release
bhrutledge May 26, 2021
90e7388
Use build instead of pep517
bhrutledge May 26, 2021
a417c3b
Update tox minversion
bhrutledge May 29, 2021
802472a
Move 'twine check' back to docs
bhrutledge May 29, 2021
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
7 changes: 5 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# pyproject.toml
[build-system]
requires = ["setuptools>=40.8", "wheel", "setuptools_scm>=1.15"]
build-backend = "setuptools.build_meta:__legacy__"
requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.0"]
build-backend = "setuptools.build_meta"

[tool.setuptools_scm]

[tool.towncrier]
package = "twine"
Expand Down
3 changes: 1 addition & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ author = Donald Stufft and individual contributors
author_email = donald@stufft.io
description = Collection of utilities for publishing packages on PyPI
long_description = file:README.rst
long_description_content_type = text/x-rst
bhrutledge marked this conversation as resolved.
Show resolved Hide resolved
url = https://twine.readthedocs.io/
project_urls =
Source = https://github.com/pypa/twine/
Expand Down Expand Up @@ -43,8 +44,6 @@ install_requires=
keyring >= 15.1
rfc3986 >= 1.4.0
colorama >= 0.4.3
setup_requires =
bhrutledge marked this conversation as resolved.
Show resolved Hide resolved
setuptools_scm >= 1.15
include_package_data = True

[options.entry_points]
Expand Down
17 changes: 0 additions & 17 deletions setup.py
View file
Open in desktop

This file was deleted.

13 changes: 5 additions & 8 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[tox]
minversion = 2.4
minversion = 3.3
envlist = lint,types,py{36,37,38,39},integration,docs
isolated_build = True

[testenv]
deps =
Expand Down Expand Up @@ -35,8 +36,7 @@ commands =
sphinx-build -W -b doctest -d {envtmpdir}/doctrees docs docs/_build/html
doc8 docs README.rst --ignore-path docs/_build/html
sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees docs docs/_build/linkcheck
python setup.py sdist
twine check dist/*
bhrutledge marked this conversation as resolved.
Show resolved Hide resolved
python -m twine check --strict {distdir}/*

[testenv:watch-docs]
deps =
Expand Down Expand Up @@ -85,13 +85,10 @@ commands =
towncrier {posargs}

[testenv:release]
# disabled for twine to cause it to upload itself
# skip_install = True
# specify Python 3 to use platform's default Python 3
basepython = python3
deps =
pep517>=0.5
twine>=1.13
build
path.py
passenv =
TWINE_PASSWORD
Expand All @@ -100,7 +97,7 @@ setenv =
TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
commands =
python -c "import path; path.Path('dist').rmtree_p()"
python -m pep517.build .
python -m build
bhrutledge marked this conversation as resolved.
Show resolved Hide resolved
python -m twine upload dist/*

[testenv:devpi]
Expand Down