diff --git a/.gitignore b/.gitignore index 6a946c9..901b528 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /diff_cover-0.6.2.tar.gz /diff_cover-0.7.1.tar.gz /diff_cover-0.7.2.tar.gz +/diff_cover-0.8.0.tar.gz diff --git a/python-diff-cover-0.2.9-noscripts3.patch b/python-diff-cover-0.2.9-noscripts3.patch deleted file mode 100644 index c70e5ff..0000000 --- a/python-diff-cover-0.2.9-noscripts3.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -purN diff_cover-0.2.9.orig/setup3.py diff_cover-0.2.9/setup3.py ---- diff_cover-0.2.9.orig/setup3.py 1969-12-31 19:00:00.000000000 -0500 -+++ diff_cover-0.2.9/setup3.py 2014-03-21 11:20:58.228016126 -0400 -@@ -0,0 +1,27 @@ -+#!/usr/bin/env python -+ -+from setuptools import setup -+from diff_cover import VERSION, DESCRIPTION -+ -+REQUIREMENTS = [line.strip() for line in -+ open("requirements.txt").readlines()] -+ -+setup( -+ name='diff_cover', -+ version=VERSION, -+ author='edX', -+ url='http://github.com/edx/diff-cover', -+ description=DESCRIPTION, -+ license='AGPL', -+ classifiers=['Development Status :: 3 - Alpha', -+ 'Environment :: Console', -+ 'Intended Audience :: Developers', -+ 'License :: OSI Approved :: GNU Affero General Public License v3', -+ 'Operating System :: OS Independent', -+ 'Programming Language :: Python', -+ 'Topic :: Software Development :: Testing', -+ 'Topic :: Software Development :: Quality Assurance'], -+ packages=['diff_cover'], -+ package_data={'diff_cover': ['templates/*.txt', 'templates/*.html']}, -+ install_requires=REQUIREMENTS -+) diff --git a/python-diff-cover.spec b/python-diff-cover.spec index 642fc82..cfe8049 100644 --- a/python-diff-cover.spec +++ b/python-diff-cover.spec @@ -1,12 +1,11 @@ Name: python-diff-cover -Version: 0.7.2 -Release: 3%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Automatically find diff lines that need test coverage -License: AGPLv3 +License: ASL 2.0 URL: https://github.com/edx/diff-cover/ Source0: https://pypi.python.org/packages/source/d/diff_cover/diff_cover-%{version}.tar.gz -Patch0: python-diff-cover-0.2.9-noscripts3.patch BuildArch: noarch @@ -20,16 +19,16 @@ Requires: python-setuptools Requires: python-jinja2 >= 2.7.1 Requires: python-lazy >= 1.1 Requires: python-six >= 1.6.1 -Requires: python-pygments == 1.6 +Requires: python-pygments >= 2.0.1 Requires: python-jinja2_pluralize -# Copy the python2 requires to BuildRequires so we can run the entry point +# Copy the python3 requires to BuildRequires so we can run the entry point # scripts for help2man -BuildRequires: python-jinja2 >= 2.7.1 -BuildRequires: python-lazy >= 1.1 -BuildRequires: python-six >= 1.6.1 -BuildRequires: python-pygments == 1.6 -BuildRequires: python-jinja2_pluralize +BuildRequires: python3-jinja2 >= 2.7.1 +BuildRequires: python3-lazy >= 1.1 +BuildRequires: python3-six >= 1.6.1 +BuildRequires: python3-pygments >= 2.0.1 +BuildRequires: python3-jinja2_pluralize # needed for the _git_root test BuildRequires: git @@ -66,7 +65,7 @@ BuildRequires: python3-setuptools Requires: python3-jinja2 >= 2.7.1 Requires: python3-lazy >= 1.1 Requires: python3-six >= 1.6.1 -Requires: python3-pygments >= 1.6 +Requires: python3-pygments >= 2.0.1 Requires: python3-jinja2_pluralize Requires: git @@ -84,22 +83,20 @@ diff. %setup -q -n diff_cover-%{version} rm -rf diff_cover.egg-info -# Disable scripts for the python3 package. The entry points in bindir -# will be provided by the python2 package. -%patch0 -p1 - rm -rf %{py3dir} cp -a . %{py3dir} %build %{__python2} setup.py build -( cd %{py3dir} && %{__python3} setup3.py build ) +( cd %{py3dir} && %{__python3} setup.py build ) %install +# Run the python3 install last so that it will overwrite the entry-point +# scripts in /usr/bin %{__python2} setup.py install --skip-build --root %{buildroot} -( cd %{py3dir} && %{__python3} setup3.py install --skip-build --root %{buildroot} ) +( cd %{py3dir} && %{__python3} setup.py install --skip-build --root %{buildroot} ) # Generate documentation for the scripts mkdir -p %{buildroot}%{_mandir}/man1 @@ -120,20 +117,38 @@ nosetests -v %files %license LICENSE %doc AUTHORS README.rst -%{_bindir}/diff-cover -%{_bindir}/diff-quality -%{_mandir}/man1/diff-cover.1* -%{_mandir}/man1/diff-quality.1* %{python2_sitelib}/diff_cover %{python2_sitelib}/diff_cover-%{version}-*.egg-info %files -n python3-diff-cover %license LICENSE %doc AUTHORS README.rst +%{_bindir}/diff-cover +%{_bindir}/diff-quality +%{_mandir}/man1/diff-cover.1* +%{_mandir}/man1/diff-quality.1* %{python3_sitelib}/diff_cover %{python3_sitelib}/diff_cover-%{version}-*.egg-info %changelog +* Wed Aug 26 2015 David Shea - 0.8.0-1 +- Move the /usr/bin scripts to the python3 package. +- Update to upstream 0.8.0 with the following changes: +- Added pylint support +- Fixed bug around python 1.6 and pyflakes +- Update Pygments to 2.0.1 +- Fixed bug in pylint support around duplciate code issues +- Added ability to ignore unstaged changes Thanks DanCardin +- License change to ASL 2.0 +- PyPy Support now verified in tests +- Fix for python 2.6 support +- Ensure all sources are captured when dealing with non python cobertura files. +- Suppress error output on tests when that output is expected +- Adds posargs to allow you to configure test runs more easily. +- Add support for some additional Flake8 lugins +- Fix readme syntax so diff-cover looks prettier on pypy. +- Add JSHint to diff-quality. + * Thu Jun 18 2015 Fedora Release Engineering - 0.7.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 3cfab5b..07bdeb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69a3cbdf5f0d3da48b504730ecb2e0f1 diff_cover-0.7.2.tar.gz +252dc473956bb13c2bfcf50060055a6d diff_cover-0.8.0.tar.gz