[Python-modules-commits] [python-flake8] 04/08: merge patched into master
Ondrej Novy
onovy at debian.org
Sat Dec 9 23:33:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository python-flake8.
commit 995b1a1c6623507721610b73f5f71f186f2bed95
Merge: a7b2535 9e609af
Author: Ondřej Nový <onovy at debian.org>
Date: Sun Dec 10 00:12:26 2017 +0100
merge patched into master
PKG-INFO | 3 +-
debian/.git-dpm | 6 +-
...per-constrains-from-upstream-requirements.patch | 18 +--
docs/source/release-notes/3.5.0.rst | 46 ++++++++
docs/source/release-notes/index.rst | 1 +
docs/source/user/configuration.rst | 48 ++++++++
setup.py | 8 +-
src/flake8.egg-info/PKG-INFO | 3 +-
src/flake8.egg-info/SOURCES.txt | 4 +
src/flake8.egg-info/entry_points.txt | 2 +
src/flake8.egg-info/requires.txt | 8 +-
src/flake8/__init__.py | 2 +-
src/flake8/api/legacy.py | 5 +
src/flake8/checker.py | 2 +
src/flake8/defaults.py | 2 +-
src/flake8/main/application.py | 112 +++++++++++++------
src/flake8/main/debug.py | 10 +-
src/flake8/main/git.py | 6 +
src/flake8/main/mercurial.py | 20 +++-
src/flake8/options/aggregator.py | 13 +--
src/flake8/options/config.py | 122 +++++++++++++++------
src/flake8/options/manager.py | 17 ++-
src/flake8/plugins/manager.py | 60 +++++++---
src/flake8/utils.py | 10 +-
tests/fixtures/config_files/README.rst | 10 +-
tests/fixtures/config_files/local-plugin.ini | 5 +
tests/integration/test_aggregator.py | 9 +-
tests/integration/test_plugins.py | 58 ++++++++++
tests/unit/test_application.py | 59 +++++-----
tests/unit/test_config_file_finder.py | 37 ++++++-
tests/unit/test_debug.py | 35 ++++--
tests/unit/test_get_local_plugins.py | 41 +++++++
tests/unit/test_legacy_api.py | 4 +
tests/unit/test_merged_config_parser.py | 81 +++++---------
tests/unit/test_option_manager.py | 38 ++++---
tests/unit/test_plugin_manager.py | 12 ++
tests/unit/test_plugin_type_manager.py | 2 +-
tests/unit/test_utils.py | 1 +
tests/unit/test_violation.py | 1 +
39 files changed, 692 insertions(+), 229 deletions(-)
diff --cc debian/.git-dpm
index c72138c,0000000..508c3f1
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- df9702106ebd481a9660de73757a7b7b1c651e63
- df9702106ebd481a9660de73757a7b7b1c651e63
- e9c6162434192f7a082391f7e22045e0cd9f55e9
++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 --cc debian/patches/0001-Remove-upper-constrains-from-upstream-requirements.patch
index 0686588,0000000..5188176
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-upper-constrains-from-upstream-requirements.patch
+++ b/debian/patches/0001-Remove-upper-constrains-from-upstream-requirements.patch
@@@ -1,44 -1,0 +1,44 @@@
- From df9702106ebd481a9660de73757a7b7b1c651e63 Mon Sep 17 00:00:00 2001
++From 9e609af6caea5996d6b0f7e5a6b9872dc18b3800 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
+Date: Thu, 3 Nov 2016 21:43:46 +0100
+Subject: Remove upper constrains from upstream requirements
+
+---
+ setup.cfg | 6 +++---
+ setup.py | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
- index de6418f..913fd74 100644
++index d1c2524..913fd74 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -8,9 +8,9 @@ universal = 1
+ requires-dist =
+ enum34; python_version<"3.4"
+ configparser; python_version<"3.2"
- - pyflakes >= 1.5.0, < 1.6.0
++- pyflakes >= 1.5.0, < 1.7.0
+- pycodestyle >= 2.0.0, < 2.4.0
+- mccabe >= 0.6.0, < 0.7.0
++ pyflakes >= 1.5.0
++ pycodestyle >= 2.0.0
++ mccabe >= 0.6.0
+
+ [egg_info]
+ tag_build =
+diff --git a/setup.py b/setup.py
- index de350a8..e0d3b24 100644
++index aa45e43..fe0cabb 100644
+--- a/setup.py
++++ b/setup.py
- @@ -17,9 +17,9 @@ tests_require = ['mock >= 2.0.0', 'pytest']
- # NOTE(sigmavirus24): When updating these requirements, update them in
- # setup.cfg as well.
- requires = [
- - "pyflakes >= 1.5.0, < 1.6.0",
++@@ -21,9 +21,9 @@ requires = [
++ # http://flake8.pycqa.org/en/latest/faq.html#why-does-flake8-use-ranges-for-its-dependencies
++ # And in which releases we will update those ranges here:
++ # http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
++- "pyflakes >= 1.5.0, < 1.7.0",
+- "pycodestyle >= 2.0.0, < 2.4.0",
+- "mccabe >= 0.6.0, < 0.7.0",
++ "pyflakes >= 1.5.0",
++ "pycodestyle >= 2.0.0",
++ "mccabe >= 0.6.0",
+ "setuptools >= 30",
+ ]
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-flake8.git
More information about the Python-modules-commits
mailing list