floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4183 from RonnyPfannschmidt/bump-setuptools 

fix #4177 - pin setuptools>=40.0
This commit is contained in:
Bruno Oliveira 2018-10-18 07:49:03 -03:00 committed by GitHub
parent 517ee588c6 a83ee197c6
commit e4871f7722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/4177.bugfix.rst Normal file
View File

@ -0,0 +1 @@
Pin ``setuptools>=40.0`` to support ``py_modules`` in ``setup.cfg``

2
pyproject.toml
View File

@ -1,7 +1,7 @@
[build-system] [build-system]
requires = [ requires = [
# sync with setup.py until we discard non-pep-517/518 # sync with setup.py until we discard non-pep-517/518
"setuptools>=30.3", "setuptools>=40.0",
"setuptools-scm", "setuptools-scm",
"wheel", "wheel",
] ]

2
setup.py
View File

@ -26,7 +26,7 @@ if "_PYTEST_SETUP_SKIP_PLUGGY_DEP" not in os.environ:
def main(): def main():
setup( setup(
use_scm_version={"write_to": "src/_pytest/_version.py"}, use_scm_version={"write_to": "src/_pytest/_version.py"},
setup_requires=["setuptools-scm", "setuptools>=30.3"], setup_requires=["setuptools-scm", "setuptools>=40.0"],
package_dir={"": "src"}, package_dir={"": "src"},
install_requires=INSTALL_REQUIRES, install_requires=INSTALL_REQUIRES,
) )