From fcc4fd53b5d0682a6aeae98da518e41dda712a59 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Wed, 5 Sep 2018 07:47:44 +0000 Subject: [PATCH] [update to 2.6.0] Fix issue found in #165 - on Windows env vars are not passed around if they are empty for some reason. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Daniel Hahler (1): tests: test_central_subprocess_no_subscript: remove omit Hugo (1): Python 3.7 requires Xenial and sudo Ionel Cristian Mărieș (44): Use new name. Drop pytest 2.7 from suite, add 3.1. Other upgrades. Fix issue found in #165 - on Windows env vars are not passed around if they are empty for some reason. Change of behavior: when report generation fails log a warning instead. This is consistent with other kinds of failures (like misconfigration) that result in no coverage data/results. Closes #161. Fix assertion. Also drop coverage 3.7 - it's ancient now. Update ci conf. Downgrade xdist for old pytest and remove pytest2.7 cruft. Fix syntax (turns out it's one dep per line in tox.ini). Add missing plugins specification. Why don't I read the comments, I dunno ... Pin down docutils and make requires.io stop complaining about sphinx. Forgot to include this in a35d40b359df2a1f044332fe1b2acbeaff20a329. Drop support for pytest<=2.8 and upgrade some test deps. Load data again before combine. Make sure config path is absulutized early. Fixes failures in finish (where now we reinitialize the cov object for forced combine) that are caused by sloppy cwd changes (crazy stuff ppl put in tests). Add a test for aliasing (the combine in finish changes). Seem this becomes absolute path, just let it be. Add tests for xdist and suprocess and fix handling in xdist mode (missing data_file attr). Check if it's a path first (don't absolutize None). Create a duplicated (ish) cov object for combining as @ryanhiebert suggests. Correct tests (missing arguments). Use aliasing for non-colocation test. Add missing branch option. Undo these changes. Add a coveragerc with path configuration. Some debugging. Drop support for py2.6, pytest<=2.8 and coverage<4.0. Drop support for old coverage internals. Add python version constraint like in https://github.com/pytest-dev/pluggy/pull/106. Drop old coverage. Close #182. Restructure docs a bit. Add various new notes. Add a no_cover marker/fixture. Close #78. Document how to deal with plugins. Close #177 Drop 2.9 (xdist don't support it). Remove unused import. Increase wait time (just in case sporadic failures are caused by slow interpreter startup) and wait a bit after getting the event (just in case thiiings are slooow and interpreter is sigtermed before it gets to the sleep(5) call). Remove progress indication (not have bogus "%" in output). Update test grid. Update changelog. More stuff in chnagelog. Update changelog. Update some test deps. Include the py37 settings in the template. Bump version: 2.5.1 → 2.6.0 Jean Jordaan (1): Fix quoting Jeremy Bowman (2): Fix race condition in test Allow remote nodes to get source modules from .coveragerc Julian (1): Fix typo in plugin docu Michael (1): Added python 3.6 to classifiers Ryan Hiebert (2): New coverage instance to combine Override cov with combining_cov Samuel Giffard (1): Added in the doc a useful example to help integrate pytest-cov. Terence D. Honles (1): fix DoctestItem has no attribute fixturenames (regression from #78) hugovk (2): Drop support for EOL Python 2.6 Drop support for EOL Python 3.3 --- .gitignore | 13 +++++++++++++ Makefile | 2 +- options.conf | 4 +++- pytest-cov.spec | 34 +++++++++++++++++++++++----------- release | 2 +- upstream | 2 +- whatrequires | 1 + 7 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fd14cc3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +.*~ +*~ +*.swp +.repo-index +*.log +build.log.round* +*.tar.* +*.tgz +!*.tar.*.* +*.zip +commitmsg +results/ +rpms/ diff --git a/Makefile b/Makefile index 3c9ced7..3f138cd 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := pytest-cov -URL = http://pypi.debian.net/pytest-cov/pytest-cov-2.5.1.tar.gz +URL = https://files.pythonhosted.org/packages/d9/e2/58f90a316fbd94dd50bf5c826a23f3f5d079fb3cc448c1e9f0e3c33a3d2a/pytest-cov-2.6.0.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/options.conf b/options.conf index 5e2a4c5..eb48a69 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = pytest-cov -url = http://pypi.debian.net/pytest-cov/pytest-cov-2.5.1.tar.gz +url = https://files.pythonhosted.org/packages/d9/e2/58f90a316fbd94dd50bf5c826a23f3f5d079fb3cc448c1e9f0e3c33a3d2a/pytest-cov-2.6.0.tar.gz archives = giturl = https://github.com/pytest-dev/pytest-cov.git @@ -17,6 +17,8 @@ autoupdate = false broken_c++ = false # disable parallelization during build broken_parallel_build = false +# this package is a library compatability package and only ships versioned library files +compat = false # set conservative build flags conservative_flags = false # pass -ffast-math to compiler diff --git a/pytest-cov.spec b/pytest-cov.spec index 96f53af..619a762 100644 --- a/pytest-cov.spec +++ b/pytest-cov.spec @@ -3,29 +3,27 @@ # Generated by: autospec.py # Name : pytest-cov -Version : 2.5.1 -Release : 40 -URL : http://pypi.debian.net/pytest-cov/pytest-cov-2.5.1.tar.gz -Source0 : http://pypi.debian.net/pytest-cov/pytest-cov-2.5.1.tar.gz +Version : 2.6.0 +Release : 41 +URL : https://files.pythonhosted.org/packages/d9/e2/58f90a316fbd94dd50bf5c826a23f3f5d079fb3cc448c1e9f0e3c33a3d2a/pytest-cov-2.6.0.tar.gz +Source0 : https://files.pythonhosted.org/packages/d9/e2/58f90a316fbd94dd50bf5c826a23f3f5d079fb3cc448c1e9f0e3c33a3d2a/pytest-cov-2.6.0.tar.gz Summary : Pytest plugin for measuring coverage. Group : Development/Tools License : MIT Requires: pytest-cov-python3 +Requires: pytest-cov-license Requires: pytest-cov-python Requires: coverage +Requires: docutils Requires: pytest BuildRequires : Sphinx BuildRequires : Sphinx-python +BuildRequires : buildreq-distutils3 BuildRequires : coverage BuildRequires : coverage-python -BuildRequires : pbr -BuildRequires : pip BuildRequires : pluggy BuildRequires : py-python BuildRequires : pytest - -BuildRequires : python3-dev -BuildRequires : setuptools BuildRequires : tox BuildRequires : virtualenv @@ -35,6 +33,14 @@ Overview .. start-badges +%package license +Summary: license components for the pytest-cov package. +Group: Default + +%description license +license components for the pytest-cov package. + + %package python Summary: python components for the pytest-cov package. Group: Default @@ -54,18 +60,20 @@ python3 components for the pytest-cov package. %prep -%setup -q -n pytest-cov-2.5.1 +%setup -q -n pytest-cov-2.6.0 %build export http_proxy=http://127.0.0.1:9/ export https_proxy=http://127.0.0.1:9/ export no_proxy=localhost,127.0.0.1,0.0.0.0 export LANG=C -export SOURCE_DATE_EPOCH=1518380143 +export SOURCE_DATE_EPOCH=1536133655 python3 setup.py build -b py3 %install rm -rf %{buildroot} +mkdir -p %{buildroot}/usr/share/doc/pytest-cov +cp LICENSE %{buildroot}/usr/share/doc/pytest-cov/LICENSE python3 -tt setup.py build -b py3 install --root=%{buildroot} echo ----[ mark ]---- cat %{buildroot}/usr/lib/python3*/site-packages/*/requires.txt || : @@ -74,6 +82,10 @@ echo ----[ mark ]---- %files %defattr(-,root,root,-) +%files license +%defattr(-,root,root,-) +/usr/share/doc/pytest-cov/LICENSE + %files python %defattr(-,root,root,-) diff --git a/release b/release index 425151f..87523dd 100644 --- a/release +++ b/release @@ -1 +1 @@ -40 +41 diff --git a/upstream b/upstream index 5ecac4d..78f185e 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -9e3cd050aae4491c65c5b0dbd5325a7c9741f23c/pytest-cov-2.5.1.tar.gz +f8fa3f9efd31709a650e0fdfe0e474aee4543f1d/pytest-cov-2.6.0.tar.gz diff --git a/whatrequires b/whatrequires index 9e67e10..c0ed234 100644 --- a/whatrequires +++ b/whatrequires @@ -1 +1,2 @@ # This file contains recursive sources that require this package +alembic