diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-08-08 03:31:00 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-08-08 03:31:00 +0000 |
| commit | a01cc01896f6fb3b472622711d632100b3c86cdb (patch) | |
| tree | 21fb15bbd40fabb290446ee3aa09e491306f2a87 /user/py3-pytest/scm.patch | |
| parent | 5c572c8c2013c5833d041ea4411a189d85f312fa (diff) | |
| parent | 3f98aef31c277c4f673d3ad9db6b11b6e973ea5e (diff) | |
| download | packages-a01cc01896f6fb3b472622711d632100b3c86cdb.tar.gz packages-a01cc01896f6fb3b472622711d632100b3c86cdb.tar.bz2 packages-a01cc01896f6fb3b472622711d632100b3c86cdb.tar.xz packages-a01cc01896f6fb3b472622711d632100b3c86cdb.zip | |
Merge branch 'sr.2019.08.06' into 'master'
Misc package bumps for Maintainer: Max Rees, 2019.08.06
See merge request adelie/packages!313
Diffstat (limited to 'user/py3-pytest/scm.patch')
| -rw-r--r-- | user/py3-pytest/scm.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/user/py3-pytest/scm.patch b/user/py3-pytest/scm.patch index 799eefac0..ef45821cd 100644 --- a/user/py3-pytest/scm.patch +++ b/user/py3-pytest/scm.patch @@ -1,13 +1,12 @@ ---- pytest-3.9.1/setup.py 2018-10-16 15:46:37.000000000 -0400 -+++ pytest-3.9.1/setup.py 2018-10-22 19:32:49.261592294 -0400 -@@ -25,8 +25,8 @@ if "_PYTEST_SETUP_SKIP_PLUGGY_DEP" not i - +--- pytest-5.0.1/setup.py 2019-07-05 07:12:59.000000000 -0400 ++++ pytest-5.0.1/setup.py 2019-08-06 08:09:07.890005143 -0400 +@@ -19,7 +19,8 @@ INSTALL_REQUIRES = [ def main(): setup( -- use_scm_version={"write_to": "src/_pytest/_version.py"}, -- setup_requires=["setuptools-scm", "setuptools>=30.3"], -+ setup_requires=["setuptools>=30.3"], -+ version="3.9.1", + use_scm_version={"write_to": "src/_pytest/_version.py"}, +- setup_requires=["setuptools-scm", "setuptools>=40.0"], ++ setup_requires=["setuptools>=40.0"], ++ version="5.0.1", package_dir={"": "src"}, - install_requires=INSTALL_REQUIRES, - ) + # fmt: off + extras_require={ |