[Python-modules-commits] [guessit] 04/07: merge patched into master
Etienne Millon
emillon-guest at moszumanska.debian.org
Sun Nov 22 18:39:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
emillon-guest pushed a commit to branch master
in repository guessit.
commit 1e640e0fbac3d3a74da08c4d478ec449bb1a498d
Merge: 05bae9a dce2eb4
Author: Etienne Millon <me at emillon.org>
Date: Sun Nov 22 19:01:13 2015 +0100
merge patched into master
HISTORY.rst | 48 +-
PKG-INFO | 335 ++--------
README.rst | 282 +--------
debian/.git-dpm | 6 +-
debian/patches/test_hash.patch | 4 +-
.../__pycache__/flask_theme_support.cpython-34.pyc | Bin 0 -> 2113 bytes
docs/_themes/flask_theme_support.pyc | Bin 0 -> 2436 bytes
docs/presentation.rst | 262 +-------
docs/user/install.rst | 25 +-
docs/user/properties.rst | 263 ++++++++
guessit.egg-info/PKG-INFO | 335 ++--------
guessit.egg-info/SOURCES.txt | 6 +-
guessit.egg-info/pbr.json | 2 +-
guessit/__init__.py | 19 +-
guessit/__main__.py | 12 +-
guessit/__version__.py | 2 +-
guessit/containers.py | 63 +-
guessit/date.py | 5 +-
guessit/fileutils.py | 3 +-
guessit/guess.py | 32 +-
guessit/hash_ed2k.py | 4 +-
guessit/language.py | 34 +-
guessit/matcher.py | 157 ++---
guessit/matchtree.py | 113 +++-
guessit/patterns/__init__.py | 2 -
guessit/patterns/extension.py | 2 +-
guessit/patterns/list.py | 80 +++
guessit/plugins/transformers.py | 15 +-
guessit/slogging.py | 27 +
guessit/test/__init__.py | 2 +
guessit/test/__main__.py | 40 --
guessit/test/autodetect.yaml | 46 ++
guessit/test/episodes.yaml | 703 ++++++++++++++++++++-
guessit/test/guessittest.py | 31 +-
guessit/test/movies.yaml | 41 +-
guessit/test/test_api.py | 24 +-
guessit/test/test_autodetect.py | 12 +-
guessit/test/test_autodetect_all.py | 6 -
guessit/test/test_doctests.py | 45 --
guessit/test/test_episode.py | 6 -
guessit/test/test_hashes.py | 9 +-
guessit/test/test_language.py | 21 +-
guessit/test/test_main.py | 8 +-
guessit/test/test_matchtree.py | 42 +-
guessit/test/test_movie.py | 6 -
guessit/test/test_quality.py | 43 +-
guessit/test/test_utils.py | 129 ++--
guessit/textutils.py | 6 +-
guessit/transfo/expected_series.py | 8 +-
guessit/transfo/expected_title.py | 8 +-
guessit/transfo/guess_country.py | 10 +-
guessit/transfo/guess_date.py | 9 +-
guessit/transfo/guess_episode_details.py | 3 +-
.../transfo/guess_episode_info_from_position.py | 82 ++-
guessit/transfo/guess_episodes_rexps.py | 133 ++--
guessit/transfo/guess_filetype.py | 41 +-
guessit/transfo/guess_idnumber.py | 8 +-
guessit/transfo/guess_language.py | 98 +--
guessit/transfo/guess_movie_title_from_position.py | 54 +-
guessit/transfo/guess_properties.py | 66 +-
guessit/transfo/guess_release_group.py | 29 +-
guessit/transfo/guess_weak_episodes_rexps.py | 53 +-
guessit/transfo/guess_website.py | 5 +-
guessit/transfo/guess_year.py | 12 +-
guessit/transfo/split_explicit_groups.py | 27 +-
guessit/transfo/split_on_dash.py | 5 +-
guessit/transfo/split_path_components.py | 33 +-
setup.cfg | 2 +-
setup.py | 23 +-
69 files changed, 2229 insertions(+), 1838 deletions(-)
diff --cc debian/.git-dpm
index fa28071,0000000..7be6dff
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
- 2dca50e77af390c1f8389744d729c6b8fac5f058
- 2dca50e77af390c1f8389744d729c6b8fac5f058
- 3d668bbd590ba1f4ad288b0bd7323a06e623bb64
++dce2eb4b966def3b5a8e8ea50c82cad7334b171f
++dce2eb4b966def3b5a8e8ea50c82cad7334b171f
++5533c0e4beff88d470afc9dd6f15a54a97c2b98d
+5533c0e4beff88d470afc9dd6f15a54a97c2b98d
+guessit_0.11.0.orig.tar.gz
+de8e46cab4a9faa33c91244e8c200fecca7c1845
+148248
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/test_hash.patch
index 1d78db8,0000000..be1f704
mode 100644,000000..100644
--- a/debian/patches/test_hash.patch
+++ b/debian/patches/test_hash.patch
@@@ -1,38 -1,0 +1,38 @@@
- From 2dca50e77af390c1f8389744d729c6b8fac5f058 Mon Sep 17 00:00:00 2001
++From dce2eb4b966def3b5a8e8ea50c82cad7334b171f Mon Sep 17 00:00:00 2001
+From: Etienne Millon <me at emillon.org>
+Date: Thu, 8 Oct 2015 09:15:27 -0700
+Subject: Skip tests that need the '1MB' file
+
+In the git repository, there is a file named '1MB' (of the same size) on which
+some tests are done. It is omitted from the tarball, so these tests fail.
+
+They are not indispensable, so it's better to skip them than to make a bigger
+tarball.
+
+Forwarded: not-needed
+Last-Update: 2014-03-04
+
+Patch-Name: test_hash.patch
+---
+ guessit/test/test_hashes.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/guessit/test/test_hashes.py b/guessit/test/test_hashes.py
- index a8bc763..398a3e9 100644
++index c6a5c35..3af7454 100644
+--- a/guessit/test/test_hashes.py
++++ b/guessit/test/test_hashes.py
+@@ -26,10 +26,10 @@ from guessit.test.guessittest import *
+ class TestHashes(TestGuessit):
+ def test_hashes(self):
+ hashes = (
+- ('hash_mpc', '1MB', u'8542ad406c15c8bd'), # TODO: Check if this value is valid
+- ('hash_ed2k', '1MB', u'ed2k://|file|1MB|1048576|AA3CC5552A9931A76B61A41D306735F7|/'), # TODO: Check if this value is valid
+- ('hash_md5', '1MB', u'5d8dcbca8d8ac21766f28797d6c3954c'),
+- ('hash_sha1', '1MB', u'51d2b8f3248d7ee495b7750c8da5aa3b3819de9d'),
++# ('hash_mpc', '1MB', u'8542ad406c15c8bd'), # TODO: Check if this value is valid
++# ('hash_ed2k', '1MB', u'ed2k://|file|1MB|1048576|AA3CC5552A9931A76B61A41D306735F7|/'), # TODO: Check if this value is valid
++# ('hash_md5', '1MB', u'5d8dcbca8d8ac21766f28797d6c3954c'),
++# ('hash_sha1', '1MB', u'51d2b8f3248d7ee495b7750c8da5aa3b3819de9d'),
+ ('hash_md5', 'dummy.srt', u'64de6b5893cac24456c46a935ef9c359'),
+ ('hash_sha1', 'dummy.srt', u'a703fc0fa4518080505809bf562c6fc6f7b3c98c')
+ )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/guessit.git
More information about the Python-modules-commits
mailing list