add pipstrap extra

This commit is contained in:
Brad Warren 2021-06-22 16:38:40 -04:00
parent 8bf6be271d
commit df5d832690
2 changed files with 13 additions and 11 deletions

View file

@ -70,13 +70,11 @@ dev_extras = [
'azure-devops',
'ipdb',
'PyGithub',
'pip',
# poetry 1.2.0+ is required for it to pin pip, setuptools, and wheel. See
# https://github.com/python-poetry/poetry/issues/1584.
'poetry>=1.2.0a1',
'tox',
'twine',
'wheel',
]
docs_extras = [
@ -87,6 +85,12 @@ docs_extras = [
'sphinx_rtd_theme',
]
pipstrap_extras = [
'pip',
'setuptools',
'wheel',
]
test_extras = [
'coverage',
'mypy',
@ -100,7 +104,7 @@ test_extras = [
]
all_extras = dev_extras + docs_extras + test_extras
all_extras = dev_extras + docs_extras + pipstrap_extras + test_extras
setup(
name='certbot',
@ -141,6 +145,7 @@ setup(
'all': all_extras,
'dev': dev_extras,
'docs': docs_extras,
'pipstrap': pipstrap_extras,
'test': test_extras,
},

View file

@ -31,7 +31,7 @@ certbot-dns-route53 = {path = "../../../certbot-dns-route53"}
certbot-dns-sakuracloud = {path = "../../../certbot-dns-sakuracloud"}
certbot-nginx = {path = "../../../certbot-nginx"}
certbot-apache = {path = "../../../certbot-apache", extras = ["dev"]}
certbot = {path = "../../../certbot", extras = ["test"]}
certbot = {path = "../../../certbot", extras = ["pipstrap", "test"]}
acme = {path = "../../../acme", extras = ["test"]}
# Oldest dependencies
@ -121,9 +121,6 @@ dns-lexicon = "3.2.1"
# cython is a build dependency of pyyaml
cython = "*"
# wheel is a common build dependency and wheel 0.34.1+ does not support the
# version of setuptools pinned above (and wheel 0.34.0 is buggy).
wheel = "<0.34.0"
# Other dependencies
# We add any dependencies that must be specified in this file for any another
@ -132,12 +129,12 @@ wheel = "<0.34.0"
# pip's new dependency resolver fails on local packages that depend on each
# other when those packages are requested with extras such as 'certbot[dev]' so
# let's pin it back for now. See https://github.com/pypa/pip/issues/9204.
#
# If pip no longer needs to be pinned to a specific version, this line should
# be changed to something like `pip = "*"` to ensure pip is pinned in the
# constraints file.
pip = "20.2.4"
# wheel is pinned as part of pipstrap and wheel 0.34.1+ does not support the
# version of setuptools pinned above (and wheel 0.34.0 is buggy).
wheel = "<0.34.0"
[tool.poetry.dev-dependencies]
[build-system]