[Python-modules-commits] [python-flake8] 10/12: merge patched into master
Ondřej Nový
onovy at moszumanska.debian.org
Sun Aug 7 22:33:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository python-flake8.
commit 8590519a3026b16e199b351e72d423c61fc37ec5
Merge: 1667d3f 0e497ba
Author: Ondřej Nový <onovy at debian.org>
Date: Mon Aug 8 00:29:36 2016 +0200
merge patched into master
debian/.git-dpm | 6 +-
debian/patches/0001-Removed-pytest-options.patch | 2 +-
docs/build/.keep | 0
docs/build/html/.buildinfo | 4 -
docs/build/html/.doctrees/faq.doctree | Bin 10358 -> 0 bytes
docs/build/html/.doctrees/glossary.doctree | Bin 18793 -> 0 bytes
docs/build/html/.doctrees/index.doctree | Bin 18191 -> 0 bytes
docs/build/html/.doctrees/internal/checker.doctree | Bin 141902 -> 0 bytes
docs/build/html/.doctrees/internal/cli.doctree | Bin 78105 -> 0 bytes
.../html/.doctrees/internal/contributing.doctree | Bin 32537 -> 0 bytes
.../html/.doctrees/internal/formatters.doctree | Bin 17128 -> 0 bytes
docs/build/html/.doctrees/internal/index.doctree | Bin 4750 -> 0 bytes
.../.doctrees/internal/option_handling.doctree | Bin 171907 -> 0 bytes
.../.doctrees/internal/plugin_handling.doctree | Bin 109056 -> 0 bytes
.../build/html/.doctrees/internal/releases.doctree | Bin 17667 -> 0 bytes
.../.doctrees/internal/start-to-finish.doctree | Bin 28341 -> 0 bytes
docs/build/html/.doctrees/internal/utils.doctree | Bin 60260 -> 0 bytes
.../internal/writing-documentation.doctree | Bin 24177 -> 0 bytes
.../plugin-development/cross-compatibility.doctree | Bin 40870 -> 0 bytes
.../plugin-development/formatters.doctree | Bin 42806 -> 0 bytes
.../.doctrees/plugin-development/index.doctree | Bin 11224 -> 0 bytes
.../plugin-development/plugin-parameters.doctree | Bin 39014 -> 0 bytes
.../plugin-development/registering-plugins.doctree | Bin 17181 -> 0 bytes
.../html/.doctrees/release-notes/0.6.0.doctree | Bin 2890 -> 0 bytes
.../html/.doctrees/release-notes/0.7.0.doctree | Bin 3427 -> 0 bytes
.../html/.doctrees/release-notes/0.8.0.doctree | Bin 3074 -> 0 bytes
.../html/.doctrees/release-notes/0.9.0.doctree | Bin 3131 -> 0 bytes
.../html/.doctrees/release-notes/1.0.0.doctree | Bin 3231 -> 0 bytes
.../html/.doctrees/release-notes/1.1.0.doctree | Bin 3868 -> 0 bytes
.../html/.doctrees/release-notes/1.2.0.doctree | Bin 3316 -> 0 bytes
.../html/.doctrees/release-notes/1.3.0.doctree | Bin 2920 -> 0 bytes
.../html/.doctrees/release-notes/1.3.1.doctree | Bin 2875 -> 0 bytes
.../html/.doctrees/release-notes/1.4.0.doctree | Bin 3070 -> 0 bytes
.../html/.doctrees/release-notes/1.5.0.doctree | Bin 4034 -> 0 bytes
.../html/.doctrees/release-notes/1.6.0.doctree | Bin 6556 -> 0 bytes
.../html/.doctrees/release-notes/1.6.1.doctree | Bin 3505 -> 0 bytes
.../html/.doctrees/release-notes/1.6.2.doctree | Bin 2980 -> 0 bytes
.../html/.doctrees/release-notes/1.7.0.doctree | Bin 3901 -> 0 bytes
.../html/.doctrees/release-notes/2.0.0.doctree | Bin 6424 -> 0 bytes
.../html/.doctrees/release-notes/2.1.0.doctree | Bin 4788 -> 0 bytes
.../html/.doctrees/release-notes/2.2.0.doctree | Bin 5608 -> 0 bytes
.../html/.doctrees/release-notes/2.2.1.doctree | Bin 3352 -> 0 bytes
.../html/.doctrees/release-notes/2.2.2.doctree | Bin 3049 -> 0 bytes
.../html/.doctrees/release-notes/2.2.3.doctree | Bin 2920 -> 0 bytes
.../html/.doctrees/release-notes/2.2.4.doctree | Bin 5110 -> 0 bytes
.../html/.doctrees/release-notes/2.2.5.doctree | Bin 3218 -> 0 bytes
.../html/.doctrees/release-notes/2.3.0.doctree | Bin 4393 -> 0 bytes
.../html/.doctrees/release-notes/2.4.0.doctree | Bin 10500 -> 0 bytes
.../html/.doctrees/release-notes/2.4.1.doctree | Bin 5278 -> 0 bytes
.../html/.doctrees/release-notes/2.5.0.doctree | Bin 8535 -> 0 bytes
.../html/.doctrees/release-notes/2.5.1.doctree | Bin 5584 -> 0 bytes
.../html/.doctrees/release-notes/2.5.2.doctree | Bin 3906 -> 0 bytes
.../html/.doctrees/release-notes/2.5.3.doctree | Bin 3406 -> 0 bytes
.../html/.doctrees/release-notes/2.5.4.doctree | Bin 3120 -> 0 bytes
.../html/.doctrees/release-notes/2.5.5.doctree | Bin 3689 -> 0 bytes
.../html/.doctrees/release-notes/2.6.0.doctree | Bin 5606 -> 0 bytes
.../html/.doctrees/release-notes/2.6.1.doctree | Bin 3857 -> 0 bytes
.../html/.doctrees/release-notes/2.6.2.doctree | Bin 3080 -> 0 bytes
.../html/.doctrees/release-notes/3.0.0.doctree | Bin 13569 -> 0 bytes
.../html/.doctrees/release-notes/index.doctree | Bin 4254 -> 0 bytes
.../html/.doctrees/user/configuration.doctree | Bin 30731 -> 0 bytes
.../html/.doctrees/user/ignoring-errors.doctree | Bin 17717 -> 0 bytes
docs/build/html/.doctrees/user/index.doctree | Bin 6378 -> 0 bytes
docs/build/html/.doctrees/user/invocation.doctree | Bin 25414 -> 0 bytes
docs/build/html/.doctrees/user/options.doctree | Bin 95540 -> 0 bytes
docs/build/html/.doctrees/user/python-api.doctree | Bin 54024 -> 0 bytes
.../html/.doctrees/user/using-plugins.doctree | Bin 15208 -> 0 bytes
docs/build/html/_modules/flake8/api.html | 213 -
docs/build/html/_modules/flake8/checker.html | 850 --
.../html/_modules/flake8/formatting/base.html | 381 -
.../html/_modules/flake8/formatting/default.html | 283 -
.../html/_modules/flake8/main/application.html | 526 -
docs/build/html/_modules/flake8/main/cli.html | 220 -
docs/build/html/_modules/flake8/main/options.html | 404 -
.../html/_modules/flake8/options/aggregator.html | 282 -
.../build/html/_modules/flake8/options/config.html | 479 -
.../html/_modules/flake8/options/manager.html | 521 -
docs/build/html/_modules/flake8/plugins/_trie.html | 300 -
.../html/_modules/flake8/plugins/manager.html | 699 --
.../html/_modules/flake8/plugins/notifier.html | 249 -
docs/build/html/_modules/flake8/processor.html | 647 --
docs/build/html/_modules/flake8/utils.html | 530 -
docs/build/html/_modules/index.html | 217 -
docs/build/html/_sources/faq.txt | 56 -
docs/build/html/_sources/glossary.txt | 57 -
docs/build/html/_sources/index.txt | 131 -
docs/build/html/_sources/internal/checker.txt | 70 -
docs/build/html/_sources/internal/cli.txt | 26 -
docs/build/html/_sources/internal/contributing.txt | 202 -
docs/build/html/_sources/internal/formatters.txt | 47 -
docs/build/html/_sources/internal/index.txt | 27 -
.../html/_sources/internal/option_handling.txt | 234 -
.../html/_sources/internal/plugin_handling.txt | 129 -
docs/build/html/_sources/internal/releases.txt | 99 -
.../html/_sources/internal/start-to-finish.txt | 129 -
docs/build/html/_sources/internal/utils.txt | 127 -
.../_sources/internal/writing-documentation.txt | 183 -
.../plugin-development/cross-compatibility.txt | 187 -
.../_sources/plugin-development/formatters.txt | 54 -
.../html/_sources/plugin-development/index.txt | 56 -
.../plugin-development/plugin-parameters.txt | 170 -
.../plugin-development/registering-plugins.txt | 135 -
docs/build/html/_sources/release-notes/0.6.0.txt | 4 -
docs/build/html/_sources/release-notes/0.7.0.txt | 6 -
docs/build/html/_sources/release-notes/0.8.0.txt | 5 -
docs/build/html/_sources/release-notes/0.9.0.txt | 5 -
docs/build/html/_sources/release-notes/1.0.0.txt | 5 -
docs/build/html/_sources/release-notes/1.1.0.txt | 8 -
docs/build/html/_sources/release-notes/1.2.0.txt | 6 -
docs/build/html/_sources/release-notes/1.3.0.txt | 4 -
docs/build/html/_sources/release-notes/1.3.1.txt | 4 -
docs/build/html/_sources/release-notes/1.4.0.txt | 5 -
docs/build/html/_sources/release-notes/1.5.0.txt | 9 -
docs/build/html/_sources/release-notes/1.6.0.txt | 14 -
docs/build/html/_sources/release-notes/1.6.1.txt | 7 -
docs/build/html/_sources/release-notes/1.6.2.txt | 4 -
docs/build/html/_sources/release-notes/1.7.0.txt | 9 -
docs/build/html/_sources/release-notes/2.0.0.txt | 13 -
docs/build/html/_sources/release-notes/2.1.0.txt | 12 -
docs/build/html/_sources/release-notes/2.2.0.txt | 12 -
docs/build/html/_sources/release-notes/2.2.1.txt | 5 -
docs/build/html/_sources/release-notes/2.2.2.txt | 5 -
docs/build/html/_sources/release-notes/2.2.3.txt | 4 -
docs/build/html/_sources/release-notes/2.2.4.txt | 20 -
docs/build/html/_sources/release-notes/2.2.5.txt | 6 -
docs/build/html/_sources/release-notes/2.3.0.txt | 10 -
docs/build/html/_sources/release-notes/2.4.0.txt | 33 -
docs/build/html/_sources/release-notes/2.4.1.txt | 12 -
docs/build/html/_sources/release-notes/2.5.0.txt | 25 -
docs/build/html/_sources/release-notes/2.5.1.txt | 13 -
docs/build/html/_sources/release-notes/2.5.2.txt | 7 -
docs/build/html/_sources/release-notes/2.5.3.txt | 5 -
docs/build/html/_sources/release-notes/2.5.4.txt | 4 -
docs/build/html/_sources/release-notes/2.5.5.txt | 7 -
docs/build/html/_sources/release-notes/2.6.0.txt | 15 -
docs/build/html/_sources/release-notes/2.6.1.txt | 6 -
docs/build/html/_sources/release-notes/2.6.2.txt | 4 -
docs/build/html/_sources/release-notes/3.0.0.txt | 49 -
docs/build/html/_sources/release-notes/index.txt | 47 -
docs/build/html/_sources/user/configuration.txt | 227 -
docs/build/html/_sources/user/ignoring-errors.txt | 90 -
docs/build/html/_sources/user/index.txt | 33 -
docs/build/html/_sources/user/invocation.txt | 144 -
docs/build/html/_sources/user/options.txt | 730 --
docs/build/html/_sources/user/python-api.txt | 103 -
docs/build/html/_sources/user/using-plugins.txt | 66 -
docs/build/html/_static/ajax-loader.gif | Bin 673 -> 0 bytes
docs/build/html/_static/basic.css | 604 --
docs/build/html/_static/comment-bright.png | Bin 3500 -> 0 bytes
docs/build/html/_static/comment-close.png | Bin 3578 -> 0 bytes
docs/build/html/_static/comment.png | Bin 3445 -> 0 bytes
docs/build/html/_static/css/badge_only.css | 2 -
docs/build/html/_static/css/theme.css | 5 -
docs/build/html/_static/doctools.js | 287 -
docs/build/html/_static/down-pressed.png | Bin 347 -> 0 bytes
docs/build/html/_static/down.png | Bin 347 -> 0 bytes
docs/build/html/_static/file.png | Bin 358 -> 0 bytes
docs/build/html/_static/fonts/Inconsolata-Bold.ttf | Bin 66352 -> 0 bytes
.../html/_static/fonts/Inconsolata-Regular.ttf | Bin 84548 -> 0 bytes
docs/build/html/_static/fonts/Lato-Bold.ttf | Bin 121788 -> 0 bytes
docs/build/html/_static/fonts/Lato-Regular.ttf | Bin 120196 -> 0 bytes
docs/build/html/_static/fonts/RobotoSlab-Bold.ttf | Bin 170616 -> 0 bytes
.../html/_static/fonts/RobotoSlab-Regular.ttf | Bin 169064 -> 0 bytes
.../html/_static/fonts/fontawesome-webfont.eot | Bin 56006 -> 0 bytes
.../html/_static/fonts/fontawesome-webfont.svg | 520 -
.../html/_static/fonts/fontawesome-webfont.ttf | Bin 112160 -> 0 bytes
.../html/_static/fonts/fontawesome-webfont.woff | Bin 65452 -> 0 bytes
docs/build/html/_static/jquery-1.11.1.js | 10308 -------------------
docs/build/html/_static/jquery.js | 4 -
docs/build/html/_static/js/modernizr.min.js | 4 -
docs/build/html/_static/js/theme.js | 153 -
docs/build/html/_static/minus.png | Bin 173 -> 0 bytes
docs/build/html/_static/plus.png | Bin 173 -> 0 bytes
docs/build/html/_static/pygments.css | 65 -
docs/build/html/_static/searchtools.js | 651 --
docs/build/html/_static/underscore-1.3.1.js | 999 --
docs/build/html/_static/underscore.js | 31 -
docs/build/html/_static/up-pressed.png | Bin 345 -> 0 bytes
docs/build/html/_static/up.png | Bin 345 -> 0 bytes
docs/build/html/_static/websupport.js | 808 --
docs/build/html/faq.html | 265 -
docs/build/html/genindex.html | 1873 ----
docs/build/html/glossary.html | 257 -
docs/build/html/index.html | 391 -
docs/build/html/internal/checker.html | 786 --
docs/build/html/internal/cli.html | 530 -
docs/build/html/internal/contributing.html | 377 -
docs/build/html/internal/formatters.html | 282 -
docs/build/html/internal/index.html | 304 -
docs/build/html/internal/option_handling.html | 899 --
docs/build/html/internal/plugin_handling.html | 676 --
docs/build/html/internal/releases.html | 307 -
docs/build/html/internal/start-to-finish.html | 347 -
docs/build/html/internal/utils.html | 501 -
.../build/html/internal/writing-documentation.html | 381 -
docs/build/html/objects.inv | Bin 3835 -> 0 bytes
.../plugin-development/cross-compatibility.html | 434 -
docs/build/html/plugin-development/formatters.html | 413 -
docs/build/html/plugin-development/index.html | 279 -
.../html/plugin-development/plugin-parameters.html | 373 -
.../plugin-development/registering-plugins.html | 339 -
docs/build/html/py-modindex.html | 225 -
docs/build/html/release-notes/0.6.0.html | 259 -
docs/build/html/release-notes/0.7.0.html | 264 -
docs/build/html/release-notes/0.8.0.html | 263 -
docs/build/html/release-notes/0.9.0.html | 263 -
docs/build/html/release-notes/1.0.0.html | 263 -
docs/build/html/release-notes/1.1.0.html | 266 -
docs/build/html/release-notes/1.2.0.html | 264 -
docs/build/html/release-notes/1.3.0.html | 262 -
docs/build/html/release-notes/1.3.1.html | 262 -
docs/build/html/release-notes/1.4.0.html | 263 -
docs/build/html/release-notes/1.5.0.html | 267 -
docs/build/html/release-notes/1.6.0.html | 272 -
docs/build/html/release-notes/1.6.1.html | 265 -
docs/build/html/release-notes/1.6.2.html | 262 -
docs/build/html/release-notes/1.7.0.html | 267 -
docs/build/html/release-notes/2.0.0.html | 271 -
docs/build/html/release-notes/2.1.0.html | 270 -
docs/build/html/release-notes/2.2.0.html | 270 -
docs/build/html/release-notes/2.2.1.html | 263 -
docs/build/html/release-notes/2.2.2.html | 263 -
docs/build/html/release-notes/2.2.3.html | 262 -
docs/build/html/release-notes/2.2.4.html | 277 -
docs/build/html/release-notes/2.2.5.html | 263 -
docs/build/html/release-notes/2.3.0.html | 265 -
docs/build/html/release-notes/2.4.0.html | 281 -
docs/build/html/release-notes/2.4.1.html | 265 -
docs/build/html/release-notes/2.5.0.html | 271 -
docs/build/html/release-notes/2.5.1.html | 266 -
docs/build/html/release-notes/2.5.2.html | 264 -
docs/build/html/release-notes/2.5.3.html | 263 -
docs/build/html/release-notes/2.5.4.html | 262 -
docs/build/html/release-notes/2.5.5.html | 264 -
docs/build/html/release-notes/2.6.0.html | 269 -
docs/build/html/release-notes/2.6.1.html | 264 -
docs/build/html/release-notes/2.6.2.html | 262 -
docs/build/html/release-notes/3.0.0.html | 293 -
docs/build/html/release-notes/index.html | 301 -
docs/build/html/search.html | 217 -
docs/build/html/searchindex.js | 1 -
docs/build/html/user/configuration.html | 419 -
docs/build/html/user/ignoring-errors.html | 303 -
docs/build/html/user/index.html | 256 -
docs/build/html/user/invocation.html | 334 -
docs/build/html/user/options.html | 740 --
docs/build/html/user/python-api.html | 465 -
docs/build/html/user/using-plugins.html | 276 -
248 files changed, 4 insertions(+), 48312 deletions(-)
diff --cc debian/.git-dpm
index fc271de,0000000..ea3c999
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
- 9c140228a3885d190b23240b871fa31c77c48717
- 9c140228a3885d190b23240b871fa31c77c48717
- cab28e68534685d9e6296ac5040b0fc2b6df08ce
++0e497bad2bbb72446e4875447c984d1a67ec7f58
++0e497bad2bbb72446e4875447c984d1a67ec7f58
++7551f2be03bc42dce0020386ca41c9af4a9ab45f
+7551f2be03bc42dce0020386ca41c9af4a9ab45f
+python-flake8_3.0.3+dfsg1.orig.tar.gz
+89d5e3ae9135b4d7126f480ec0544202fa7a5352
+121256
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Removed-pytest-options.patch
index c8ee15e,0000000..2c23e56
mode 100644,000000..100644
--- a/debian/patches/0001-Removed-pytest-options.patch
+++ b/debian/patches/0001-Removed-pytest-options.patch
@@@ -1,24 -1,0 +1,24 @@@
- From 9c140228a3885d190b23240b871fa31c77c48717 Mon Sep 17 00:00:00 2001
++From 0e497bad2bbb72446e4875447c984d1a67ec7f58 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
+Date: Sun, 7 Aug 2016 23:48:45 +0200
+Subject: Removed pytest options
+
+---
+ setup.cfg | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index c32a36a..43d3a45 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -12,10 +12,6 @@ requires-dist =
+ pycodestyle >= 2.0.0, < 2.1.0
+ mccabe >= 0.5.0, < 0.6.0
+
+-[pytest]
+-norecursedirs = .git .* *.egg* old docs dist build
+-addopts = -rw
+-
+ [egg_info]
+ tag_build =
+ tag_date = 0
--
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