diff -Nru python-flake8-3.5.0/debian/changelog python-flake8-3.5.0/debian/changelog --- python-flake8-3.5.0/debian/changelog 2018-09-25 02:08:21.000000000 +0000 +++ python-flake8-3.5.0/debian/changelog 2018-09-28 09:09:01.000000000 +0000 @@ -1,8 +1,17 @@ -python-flake8 (3.5.0-1ubuntu1) cosmic; urgency=medium +python-flake8 (3.5.0-2) unstable; urgency=medium - * Backport compatibility with pycodestyle 2.4.0 from upstream. + * d/control: Set Vcs-* to salsa.debian.org + * d/tests: Use AUTOPKGTEST_TMP instead of ADTTMP + * d/control: Remove ancient X-Python-Version field + * d/control: Remove ancient X-Python3-Version field + * Convert git repository from git-dpm to gbp layout + * Backport compatibility with pycodestyle 2.4.0 from upstream + (From Ubuntu) + * d/rules: Don't run tests with nocheck build profile + * Add upstream metadata + * Bump standards version to 4.2.1 (no changes) - -- Michael Hudson-Doyle Tue, 25 Sep 2018 14:08:21 +1200 + -- Ondřej Nový Fri, 28 Sep 2018 11:09:01 +0200 python-flake8 (3.5.0-1) unstable; urgency=medium diff -Nru python-flake8-3.5.0/debian/compat python-flake8-3.5.0/debian/compat --- python-flake8-3.5.0/debian/compat 2018-09-25 02:04:06.000000000 +0000 +++ python-flake8-3.5.0/debian/compat 2018-09-28 08:47:07.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru python-flake8-3.5.0/debian/control python-flake8-3.5.0/debian/control --- python-flake8-3.5.0/debian/control 2018-09-25 02:04:06.000000000 +0000 +++ python-flake8-3.5.0/debian/control 2018-09-28 09:04:56.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Chris Johnston , Ondřej Nový , Barry Warsaw , -Build-Depends: debhelper (>= 10), +Build-Depends: debhelper (>= 11~), dh-python, pycodestyle, python-all, @@ -14,7 +14,7 @@ python-mccabe (>= 0.6.0), python-mock (>= 2.0.0), python-nose, - python-pycodestyle, + python-pycodestyle (>= 2.4.0), python-pyflakes (>= 1.5.0), python-pytest, python-pytest-runner, @@ -23,23 +23,22 @@ python3-mccabe (>= 0.6.0), python3-mock (>= 2.0.0), python3-nose, - python3-pycodestyle, + python3-pycodestyle (>= 2.4.0), python3-pyflakes (>= 1.5.0), python3-pytest, python3-pytest-runner, python3-setuptools (>= 30), -Standards-Version: 4.1.1 +Standards-Version: 4.2.1 Homepage: https://gitlab.com/pycqa/flake8 Testsuite: autopkgtest-pkg-python -Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-flake8.git -Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-flake8.git -X-Python-Version: >= 2.7 -X-Python3-Version: >= 3.4 +Vcs-Git: https://salsa.debian.org/python-team/modules/python-flake8.git +Vcs-Browser: https://salsa.debian.org/python-team/modules/python-flake8 Package: flake8 Architecture: all Depends: python3-flake8 (=${binary:Version}), python3-pkg-resources, + python3-pycodestyle (>= 2.4.0), ${misc:Depends}, ${python3:Depends}, Replaces: python-flake8 (<< 2.5.4-1), @@ -57,6 +56,7 @@ Depends: python-configparser, python-enum34, python-mccabe (>= 0.6.0), + python-pycodestyle (>= 2.4.0), python-pyflakes (>= 1.5.0), python-setuptools (>= 30), ${misc:Depends}, diff -Nru python-flake8-3.5.0/debian/.git-dpm python-flake8-3.5.0/debian/.git-dpm --- python-flake8-3.5.0/debian/.git-dpm 2018-09-25 02:04:06.000000000 +0000 +++ python-flake8-3.5.0/debian/.git-dpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -# see git-dpm(1) from git-dpm package -9e609af6caea5996d6b0f7e5a6b9872dc18b3800 -9e609af6caea5996d6b0f7e5a6b9872dc18b3800 -61375eeebdf6b009c9c469323bd4069c9d746270 -61375eeebdf6b009c9c469323bd4069c9d746270 -python-flake8_3.5.0.orig.tar.gz -302f39432917f57bb4f0f1c1573c96074913b46f -140608 -debianTag="debian/%e%v" -patchedTag="patched/%e%v" -upstreamTag="upstream/%e%u" diff -Nru python-flake8-3.5.0/debian/rules python-flake8-3.5.0/debian/rules --- python-flake8-3.5.0/debian/rules 2018-09-25 02:04:06.000000000 +0000 +++ python-flake8-3.5.0/debian/rules 2018-09-28 09:00:04.000000000 +0000 @@ -10,11 +10,13 @@ PYBUILD_SYSTEM=custom PYBUILD_TEST_ARGS="{interpreter} setup.py test" dh_auto_test override_dh_auto_install: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) dh_auto_install rm -rf debian/python-flake8/usr/bin mkdir -p debian/flake8/usr mv $(CURDIR)/debian/python3-flake8/usr/bin $(CURDIR)/debian/flake8/usr/ +endif override_dh_installchangelogs: rm -f debian/upstream-changelog diff -Nru python-flake8-3.5.0/debian/tests/tools python-flake8-3.5.0/debian/tests/tools --- python-flake8-3.5.0/debian/tests/tools 2018-09-25 02:04:06.000000000 +0000 +++ python-flake8-3.5.0/debian/tests/tools 2018-09-28 08:47:07.000000000 +0000 @@ -4,7 +4,7 @@ flake8 setup.py # create a known-bad file -cat << EOF > $ADTTMP/test.py +cat << EOF > $AUTOPKGTEST_TMP/test.py import sys # unused import print('Hello world, this is an overly long line for PEP-8. We expect flake8 to complain') @@ -12,17 +12,17 @@ count += 1 EOF set +e -flake8 $ADTTMP/test.py > $ADTTMP/out +flake8 $AUTOPKGTEST_TMP/test.py > $AUTOPKGTEST_TMP/out RC=$? set -e echo 'flake8 output on known-bad file:' -cat $ADTTMP/out +cat $AUTOPKGTEST_TMP/out if [ $RC -eq 0 ]; then echo "flake8 expected to fail, but it succeeded:" >&2 exit 1 fi -grep -q 'F401.*sys' $ADTTMP/out -grep -q 'E501.*line too long' $ADTTMP/out -grep -q 'F821.*count' $ADTTMP/out +grep -q 'F401.*sys' $AUTOPKGTEST_TMP/out +grep -q 'E501.*line too long' $AUTOPKGTEST_TMP/out +grep -q 'F821.*count' $AUTOPKGTEST_TMP/out diff -Nru python-flake8-3.5.0/debian/upstream/metadata python-flake8-3.5.0/debian/upstream/metadata --- python-flake8-3.5.0/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ python-flake8-3.5.0/debian/upstream/metadata 2018-09-28 09:04:30.000000000 +0000 @@ -0,0 +1,5 @@ +Bug-Database: https://gitlab.com/pycqa/flake8/issues +Bug-Submit: https://gitlab.com/pycqa/flake8/issues/new +Name: flake8 +Repository: https://gitlab.com/pycqa/flake8.git +Repository-Browse: https://gitlab.com/pycqa/flake8