* [gentoo-commits] repo/gentoo:master commit in: dev-python/guessit/files/, dev-python/guessit/
@ 2016-05-12 11:40 Ian Delaney
0 siblings, 0 replies; 3+ messages in thread
From: Ian Delaney @ 2016-05-12 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 66e3db7c0e0fab956d152d12d812643cb846ae0d
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Wed May 11 04:07:51 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Thu May 12 11:39:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e3db7c
dev-python/guessit: remove old
Package-Manager: portage-2.2.28
Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>
dev-python/guessit/Manifest | 4 -
.../guessit/files/guessit-0.5.4-python3.patch | 30 ----
dev-python/guessit/files/guessit-0.5.4-tests.patch | 172 ---------------------
dev-python/guessit/guessit-0.5.4.ebuild | 38 -----
dev-python/guessit/guessit-0.6.2.ebuild | 30 ----
dev-python/guessit/guessit-0.7.1.ebuild | 32 ----
dev-python/guessit/guessit-0.9.3.ebuild | 34 ----
7 files changed, 340 deletions(-)
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index ecef512..fe1ab14 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,5 +1 @@
-DIST guessit-0.5.4.tar.gz 93050 SHA256 2c4b2c3c703485a03794746a496fae69f1da5d8c9eaf08b8e9571515704b69b0 SHA512 353f45a80726edc6978be3707916a4919c140f2304668f7e1e9453fb1c225f83e9f19a317b8b3eafff449a41fd959fceeb6eecc7021862f856a34cd9608c170c WHIRLPOOL 3465f5dd0d029d2252930c7ceebf963b85466374912919500a15258707a10faa5379a91d23ba81204324895fb37de9e1ced8c6daa6ed12e46258b82319de856a
-DIST guessit-0.6.2.tar.gz 123216 SHA256 27d6dfa29f01f4897688d04d94d58298b4e1b94163d8ff72646be59bed5ab6db SHA512 0c9340c0755ef91ce432ed80a0131659f23489e57092270b2acc433b74930bb3b3759959ab5cb3547c10b6011e2f52db56feffd8e7ec7bc6e31fdcd1d786b8f9 WHIRLPOOL fd86094931d3a309363a8abf739152062ef854997ee2c0a17ef85fb1a1afb9fe82a8db299be5da075a62ca6542b5ab31e9c87a6f9aed0be6f1df49550e39b157
-DIST guessit-0.7.1.tar.gz 1177369 SHA256 4315afd516ff824a1ccd857a43b74fb2f0f1b794f8049685eae72d6e64d8dc92 SHA512 ce30496852eeb46f6e49744e6f3a32045145da27226a7520a12ce911289ff45be5c704899377bd4b708867205dd230a9a464bc4d11d6dc1beec334054603be9e WHIRLPOOL c96f7740b8a0ae026d986f367bb3b4665e915ed83edb547db135cdf2acbf3f1faae8a43f5ef0e509faf7e856c3db59d01a8a17008ebbddfcf8af22e5e5d79483
-DIST guessit-0.9.3.tar.gz 1194884 SHA256 0fd4bee04214dc0474089ac6fed3c9e64b8c635085681b911834f9b0bb074b81 SHA512 ae2939433a8642f3a6579ccb5247bfb0eda68959a4449a4134fbefdab8572ccfa1fefed90783b82505acdf67006a11bfeef5d05ee7787da2cd44e4f447472513 WHIRLPOOL e01cb8acb1d7d6dafa896e14a9eaa968039bbcebf4ce31b63c28438c4b96ea004fd94a6527747c8dc10dbfef8bcaea3c82dec68eb1dbb384e8406306c81bacbd
DIST guessit-1.0.3.tar.gz 1200782 SHA256 6de9149b663b415ebc1f4ab9f12eb624ca859cf13cc1a491382f56619f33f59b SHA512 be427d3ac5b598fe14b26b4fa41c3bd9c0cc946df85381c61be9180275b54f6beac9d433ba781f4351bf94eba5a53b1097d8503268efd9019d50beb60f92cfcb WHIRLPOOL 31b2bb0e57a395f38f7ebe2420945cf00e00149a8345db245c3978cebb6366b53b8b1eae89838d4729e1e8c15abef2f4c8c91f64e5eb3e6f36a56f54de715546
diff --git a/dev-python/guessit/files/guessit-0.5.4-python3.patch b/dev-python/guessit/files/guessit-0.5.4-python3.patch
deleted file mode 100644
index 954c715..0000000
--- a/dev-python/guessit/files/guessit-0.5.4-python3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 93f4fe97f664c207e769186fe79961bf5a998447 Mon Sep 17 00:00:00 2001
-From: Nicolas Wack <wackou@gmail.com>
-Date: Thu, 25 Apr 2013 16:05:05 +0200
-Subject: [PATCH] Fixed some unicode issues when reading files from disk
-
----
- guessit/fileutils.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/guessit/fileutils.py b/guessit/fileutils.py
-index 2fca6b7..dc077e6 100644
---- a/guessit/fileutils.py
-+++ b/guessit/fileutils.py
-@@ -22,6 +22,7 @@
- from guessit import s, u
- import os.path
- import zipfile
-+import io
-
-
- def split_path(path):
-@@ -84,4 +85,4 @@ def load_file_in_same_dir(ref_file, filename):
- zfile = zipfile.ZipFile(zfilename)
- return zfile.read('/'.join(path[i + 1:]))
-
-- return u(open(os.path.join(*path)).read())
-+ return u(io.open(os.path.join(*path), encoding='utf-8').read())
---
-1.8.1.6
-
diff --git a/dev-python/guessit/files/guessit-0.5.4-tests.patch b/dev-python/guessit/files/guessit-0.5.4-tests.patch
deleted file mode 100644
index 50d8f57..0000000
--- a/dev-python/guessit/files/guessit-0.5.4-tests.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 409218bc3d5b62e4f3e37aa57126cd628a34bd21 Mon Sep 17 00:00:00 2001
-From: Nicolas Wack <wackou@gmail.com>
-Date: Fri, 19 Apr 2013 22:08:38 +0200
-Subject: [PATCH] Allow to run tests using "python setup.py test"; fixed
- autodetect_all test target
-
----
- fabfile.py | 1 +
- setup.py | 3 ++-
- tests/__init__.py | 0
- tests/guessittest.py | 19 ++++++++++++-------
- tests/test_autodetect.py | 2 +-
- tests/test_autodetect_all.py | 12 ++++++++----
- 6 files changed, 24 insertions(+), 13 deletions(-)
- create mode 100644 tests/__init__.py
-
-diff --git a/fabfile.py b/fabfile.py
-index 5b2c9fe..d8c4112 100644
---- a/fabfile.py
-+++ b/fabfile.py
-@@ -25,6 +25,7 @@ def run(self):
- test_ep = TestTask('episode', 'episodes')
- test_movie = TestTask('movie', 'movies')
- test_auto = TestTask('autodetect', 'autodetected files')
-+test_auto_all = TestTask('autodetect_all', 'all files using autodetected type')
- test_lang = TestTask('language', 'languages')
- test_utils = TestTask('utils', 'utility functions')
- test_matchtree = TestTask('matchtree', 'MatchTree')
-diff --git a/setup.py b/setup.py
-index deee110..81f907d 100644
---- a/setup.py
-+++ b/setup.py
-@@ -65,7 +65,8 @@
- include_package_data=True,
- install_requires = requires,
- entry_points=entry_points,
-- extras_require = { 'language_detection': ['guess-language>=0.2'] }
-+ extras_require = { 'language_detection': ['guess-language>=0.2'] },
-+ test_suite = 'tests'
- )
-
-
-diff --git a/tests/__init__.py b/tests/__init__.py
-new file mode 100644
-index 0000000..e69de29
-diff --git a/tests/guessittest.py b/tests/guessittest.py
-index c56b6ca..cfeaef0 100644
---- a/tests/guessittest.py
-+++ b/tests/guessittest.py
-@@ -21,7 +21,7 @@
- from __future__ import unicode_literals
- from guessit import base_text_type, u
- from guessit.slogging import setupLogging
--from unittest import *
-+from unittest import TestCase, TestLoader, TextTestRunner
-
- import yaml, logging, sys, os
- from os.path import *
-@@ -58,20 +58,25 @@ def allTests(testClass):
-
- class TestGuessit(TestCase):
-
--
--
-- def checkMinimumFieldsCorrect(self, filetype, filename, removeType=True):
-+ def checkMinimumFieldsCorrect(self, filetype, filename, remove_type=True,
-+ exclude_files=None):
- groundTruth = yaml.load(load_file_in_same_dir(__file__, filename))
- def guess_func(string):
- return guess_file_info(string, filetype=filetype)
-
-- return self.checkFields(groundTruth, guess_func, removeType)
-+ return self.checkFields(groundTruth, guess_func, remove_type, exclude_files)
-
-- def checkFields(self, groundTruth, guess_func, removeType=True):
-+
-+ def checkFields(self, groundTruth, guess_func, remove_type=True,
-+ exclude_files=None):
- correct, total = 0, 0
-+ exclude_files = exclude_files or []
-
- for filename, required_fields in groundTruth.items():
- filename = u(filename)
-+ if filename in exclude_files:
-+ continue
-+
- log.debug('\n' + '-' * 120)
- log.info('Guessing information for file: %s' % filename)
-
-@@ -85,7 +90,7 @@ def error(*args):
- is_incomplete[0] = True
-
- # no need for these in the unittests
-- if removeType:
-+ if remove_type:
- try:
- del found['type']
- except:
-diff --git a/tests/test_autodetect.py b/tests/test_autodetect.py
-index 1e0fd9d..e654afb 100644
---- a/tests/test_autodetect.py
-+++ b/tests/test_autodetect.py
-@@ -25,7 +25,7 @@ class TestAutoDetect(TestGuessit):
- def testAutoDetect(self):
- self.checkMinimumFieldsCorrect(filetype='autodetect',
- filename='autodetect.yaml',
-- removeType=False)
-+ remove_type=False)
-
-
- suite = allTests(TestAutoDetect)
-diff --git a/tests/test_autodetect_all.py b/tests/test_autodetect_all.py
-index 6aa1704..cfd3463 100644
---- a/tests/test_autodetect_all.py
-+++ b/tests/test_autodetect_all.py
-@@ -18,23 +18,27 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
- #
-
--
-+from __future__ import unicode_literals
- from guessittest import *
-
-+IGNORE_EPISODES = [ 'finale ' ]
-+IGNORE_MOVIES = []
-
- class TestAutoDetectAll(TestGuessit):
- def testAutoMatcher(self):
- self.checkMinimumFieldsCorrect(filetype='autodetect',
- filename='autodetect.yaml',
-- removeType=False)
-+ remove_type=False)
-
- def testAutoMatcherMovies(self):
- self.checkMinimumFieldsCorrect(filetype='autodetect',
-- filename='movies.yaml')
-+ filename='movies.yaml',
-+ exclude_files=IGNORE_MOVIES)
-
- def testAutoMatcherEpisodes(self):
- self.checkMinimumFieldsCorrect(filetype='autodetect',
-- filename='episodes.yaml')
-+ filename='episodes.yaml',
-+ exclude_files=IGNORE_EPISODES)
-
-
- suite = allTests(TestAutoDetectAll)
---
-1.8.1.6
-
-Added by maksbotan@gentoo.org, to be upstreamed
-
-diff -ur /var/tmp/portage/dev-python/guessit-0.5.4/work/guessit-0.5.4/tests/test_language.py guessit-0.5.4/tests/test_language.py
---- /var/tmp/portage/dev-python/guessit-0.5.4/work/guessit-0.5.4/tests/test_language.py 2013-02-11 03:49:53.000000000 +0400
-+++ guessit-0.5.4/tests/test_language.py 2013-04-25 18:41:22.000000000 +0400
-@@ -20,6 +20,7 @@
-
- from __future__ import unicode_literals
- from guessittest import *
-+import io
-
- class TestLanguage(TestGuessit):
-
-@@ -81,7 +82,7 @@
-
- def test_opensubtitles(self):
- opensubtitles_langfile = file_in_same_dir(__file__, 'opensubtitles_languages_2012_05_09.txt')
-- langs = [ u(l).strip().split('\t') for l in open(opensubtitles_langfile) ][1:]
-+ langs = [ u(l).strip().split('\t') for l in io.open(opensubtitles_langfile, encoding="utf8") ][1:]
- for lang in langs:
- # check that we recognize the opensubtitles language code correctly
- # and that we are able to output this code from a language
diff --git a/dev-python/guessit/guessit-0.5.4.ebuild b/dev-python/guessit/guessit-0.5.4.ebuild
deleted file mode 100644
index 69b0952..0000000
--- a/dev-python/guessit/guessit-0.5.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library that tries to extract as much information as possible from a filename"
-HOMEPAGE="http://guessit.readthedocs.org/"
-SRC_URI="https://github.com/wackou/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-python3.patch
- "${FILESDIR}"/${P}-tests.patch
-)
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
- #Patch fails to create this file, so use touch
- touch tests/__init__.py || die
-}
-
-python_test() {
- PYTHONPATH="${S}/tests" esetup.py test
-}
diff --git a/dev-python/guessit/guessit-0.6.2.ebuild b/dev-python/guessit/guessit-0.6.2.ebuild
deleted file mode 100644
index f6b0150..0000000
--- a/dev-python/guessit/guessit-0.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="library for guessing information from video files"
-HOMEPAGE="http://guessit.readthedocs.org https://github.com/wackou/guessit https://pypi.python.org/pypi/guessit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# FIXME fails tests with python-3.3.2-r2
-RESTRICT="test"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/guessit/guessit-0.7.1.ebuild b/dev-python/guessit/guessit-0.7.1.ebuild
deleted file mode 100644
index 86c8b75..0000000
--- a/dev-python/guessit/guessit-0.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="library for guessing information from video files"
-HOMEPAGE="http://guessit.readthedocs.org https://github.com/wackou/guessit https://pypi.python.org/pypi/guessit"
-SRC_URI="https://github.com/wackou/guessit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-python/babelfish-0.5.1[${PYTHON_USEDEP}]
- >=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-python/pyyaml[${PYTHON_USEDEP}]
- )
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/guessit/guessit-0.9.3.ebuild b/dev-python/guessit/guessit-0.9.3.ebuild
deleted file mode 100644
index 95c96f4..0000000
--- a/dev-python/guessit/guessit-0.9.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="library for guessing information from video files"
-HOMEPAGE="http://guessit.readthedocs.org https://github.com/wackou/guessit https://pypi.python.org/pypi/guessit"
-SRC_URI="https://github.com/wackou/guessit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-python/babelfish-0.5.1[${PYTHON_USEDEP}]
- >=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-python/pyyaml[${PYTHON_USEDEP}]
- )
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
- esetup.py test
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/guessit/files/, dev-python/guessit/
@ 2016-05-12 11:40 Ian Delaney
0 siblings, 0 replies; 3+ messages in thread
From: Ian Delaney @ 2016-05-12 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 6b3aa8230f88ab75fbf816974326ac7a7a7b6ca3
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Wed May 11 05:05:29 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Thu May 12 11:39:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3aa823
dev-python/guessit: verbump to 2.0.5
It's a complete rewrite since 1.x thus drop untested implementations
from PYTHON_COMPAT.
Sync 9999 ebuild with 2.0.5.
Package-Manager: portage-2.2.28
Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>
dev-python/guessit/Manifest | 1 +
...essit-2.0.5-support-noninteractive-shells.patch | 22 +++++++++
dev-python/guessit/guessit-2.0.5.ebuild | 53 ++++++++++++++++++++++
dev-python/guessit/guessit-9999.ebuild | 42 ++++++++++-------
4 files changed, 102 insertions(+), 16 deletions(-)
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index fe1ab14..fcec1cd 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1 +1,2 @@
DIST guessit-1.0.3.tar.gz 1200782 SHA256 6de9149b663b415ebc1f4ab9f12eb624ca859cf13cc1a491382f56619f33f59b SHA512 be427d3ac5b598fe14b26b4fa41c3bd9c0cc946df85381c61be9180275b54f6beac9d433ba781f4351bf94eba5a53b1097d8503268efd9019d50beb60f92cfcb WHIRLPOOL 31b2bb0e57a395f38f7ebe2420945cf00e00149a8345db245c3978cebb6366b53b8b1eae89838d4729e1e8c15abef2f4c8c91f64e5eb3e6f36a56f54de715546
+DIST guessit-2.0.5.tar.gz 74464 SHA256 626e0024c5cca9b84883b65246e4f238e3f39064664486f69f086c853a63ff61 SHA512 6d02df5caebc0373ea0609b2ef4fa0b2ca2bedce62f5df3f1bdcf84808c09aff57f1c043704effedfb3ca4dbd4235f5a84c5580b1f2839f79933b40342309d2a WHIRLPOOL da5da3ac6a27f96714683acafe9664c316c522290cdd01308097c42fd55e8df16f735e54938c1e8b7b3c2531426d00b60c5361aedd8da8eea597fdc27a22b858
diff --git a/dev-python/guessit/files/guessit-2.0.5-support-noninteractive-shells.patch b/dev-python/guessit/files/guessit-2.0.5-support-noninteractive-shells.patch
new file mode 100644
index 0000000..e0678d1
--- /dev/null
+++ b/dev-python/guessit/files/guessit-2.0.5-support-noninteractive-shells.patch
@@ -0,0 +1,22 @@
+commit e43ef015ae88c43fa39274a23515adbe22ba2b2a
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date: Tue May 10 08:06:13 2016 +0300
+
+options: fix StrOptType for non-interactive shells on Python 2
+
+Closes: https://github.com/guessit-io/guessit/issues/293
+---
+
+diff --git a/guessit/options.py b/guessit/options.py
+index 3d60ef9..41ba143 100644
+--- a/guessit/options.py
++++ b/guessit/options.py
+@@ -11,7 +11,7 @@ import six
+
+
+ if six.PY2:
+- StrOptType = lambda s: unicode(s, sys.stdin.encoding) # pylint:disable=undefined-variable
++ StrOptType = lambda s: unicode(s, sys.stdin.encoding) if sys.stdin.isatty() else unicode(s, 'UTF-8') # pylint:disable=undefined-variable
+ else:
+ StrOptType = str # pylint:disable=redefined-variable-type
+
diff --git a/dev-python/guessit/guessit-2.0.5.ebuild b/dev-python/guessit/guessit-2.0.5.ebuild
new file mode 100644
index 0000000..cbe9608
--- /dev/null
+++ b/dev-python/guessit/guessit-2.0.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for guessing information from video filenames"
+HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-python/rebulk-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+ <dev-python/python-dateutil-2.5.2[${PYTHON_USEDEP}]
+ dev-python/stevedore[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+ dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+ dev-python/pytest-runner[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=( "${FILESDIR}/${P}-support-noninteractive-shells.patch" )
+
+python_prepare_all() {
+ # Disable benchmarks as they require unavailable pytest-benchmark.
+ rm guessit/test/test_benchmark.py || die
+ sed -i -e "s|'pytest-benchmark',||g" setup.py || die
+
+ # Disable unconditional dependency on dev-python/pytest-runner.
+ sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/guessit/guessit-9999.ebuild b/dev-python/guessit/guessit-9999.ebuild
index 83f23cb..0eed9f6 100644
--- a/dev-python/guessit/guessit-9999.ebuild
+++ b/dev-python/guessit/guessit-9999.ebuild
@@ -2,42 +2,52 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+EAPI=6
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/wackou/guessit.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/wackou/guessit/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
+PYTHON_COMPAT=( python{2_7,3_4} )
-inherit distutils-r1
+inherit distutils-r1 git-r3
-DESCRIPTION="library for guessing information from video files"
-HOMEPAGE="http://guessit.readthedocs.org https://github.com/wackou/guessit https://pypi.python.org/pypi/guessit"
+DESCRIPTION="Python library for guessing information from video filenames"
+HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit"
+EGIT_REPO_URI="git://github.com/${PN}-io/${PN}.git"
LICENSE="LGPL-3"
SLOT="0"
+KEYWORDS=""
IUSE="test"
RDEPEND="
+ >=dev-python/rebulk-0.7.1[${PYTHON_USEDEP}]
>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
- >=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+ <dev-python/python-dateutil-2.5.2[${PYTHON_USEDEP}]
+ dev-python/stevedore[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
test? (
>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+ dev-python/pytest-runner[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
)
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
"
+PATCHES=( "${FILESDIR}/${PN}-2.0.5-support-noninteractive-shells.patch" )
+
+python_prepare_all() {
+ # Disable benchmarks as they require unavailable pytest-benchmark.
+ rm guessit/test/test_benchmark.py || die
+ sed -i -e "s|'pytest-benchmark',||g" setup.py || die
+
+ # Disable unconditional dependency on dev-python/pytest-runner.
+ sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
python_test() {
esetup.py test
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/guessit/files/, dev-python/guessit/
@ 2017-01-16 17:55 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2017-01-16 17:55 UTC (permalink / raw
To: gentoo-commits
commit: 1fd8ab5d61c7ce81652b3a6ee8d62e3eda8c9f19
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Jan 16 11:04:00 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 17:55:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fd8ab5d
dev-python/guessit: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-python/guessit/Manifest | 1 -
...essit-2.0.5-support-noninteractive-shells.patch | 22 ---------
dev-python/guessit/guessit-2.0.5-r1.ebuild | 52 ----------------------
3 files changed, 75 deletions(-)
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index a27db46..57f8371 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,3 +1,2 @@
DIST guessit-1.0.3.tar.gz 1200782 SHA256 6de9149b663b415ebc1f4ab9f12eb624ca859cf13cc1a491382f56619f33f59b SHA512 be427d3ac5b598fe14b26b4fa41c3bd9c0cc946df85381c61be9180275b54f6beac9d433ba781f4351bf94eba5a53b1097d8503268efd9019d50beb60f92cfcb WHIRLPOOL 31b2bb0e57a395f38f7ebe2420945cf00e00149a8345db245c3978cebb6366b53b8b1eae89838d4729e1e8c15abef2f4c8c91f64e5eb3e6f36a56f54de715546
-DIST guessit-2.0.5.tar.gz 74464 SHA256 626e0024c5cca9b84883b65246e4f238e3f39064664486f69f086c853a63ff61 SHA512 6d02df5caebc0373ea0609b2ef4fa0b2ca2bedce62f5df3f1bdcf84808c09aff57f1c043704effedfb3ca4dbd4235f5a84c5580b1f2839f79933b40342309d2a WHIRLPOOL da5da3ac6a27f96714683acafe9664c316c522290cdd01308097c42fd55e8df16f735e54938c1e8b7b3c2531426d00b60c5361aedd8da8eea597fdc27a22b858
DIST guessit-2.1.1.tar.gz 86447 SHA256 cdb51ced109e05318f35dc5ee1c50182a85edd800e86de77ec96eb68a0a99391 SHA512 61ace43bacf4bf2289bd1f0cd5105080b8302d92be8bda77942355594e07db14b594c73e4bf42bd14840f9f9723d602a38cd443cc3e1fabdca335d364fa97e2f WHIRLPOOL 885ee697f4929523527747d3ce5c0b548c6bcfe34c0e590bb1b8e5e4530ae4be6c0264a62dad83c5e2356a9063a9930ea3216f44b6df1b73000fd41c45b0e905
diff --git a/dev-python/guessit/files/guessit-2.0.5-support-noninteractive-shells.patch b/dev-python/guessit/files/guessit-2.0.5-support-noninteractive-shells.patch
deleted file mode 100644
index e0678d1..00000000
--- a/dev-python/guessit/files/guessit-2.0.5-support-noninteractive-shells.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit e43ef015ae88c43fa39274a23515adbe22ba2b2a
-Author: Ilya Tumaykin <itumaykin@gmail.com>
-Date: Tue May 10 08:06:13 2016 +0300
-
-options: fix StrOptType for non-interactive shells on Python 2
-
-Closes: https://github.com/guessit-io/guessit/issues/293
----
-
-diff --git a/guessit/options.py b/guessit/options.py
-index 3d60ef9..41ba143 100644
---- a/guessit/options.py
-+++ b/guessit/options.py
-@@ -11,7 +11,7 @@ import six
-
-
- if six.PY2:
-- StrOptType = lambda s: unicode(s, sys.stdin.encoding) # pylint:disable=undefined-variable
-+ StrOptType = lambda s: unicode(s, sys.stdin.encoding) if sys.stdin.isatty() else unicode(s, 'UTF-8') # pylint:disable=undefined-variable
- else:
- StrOptType = str # pylint:disable=redefined-variable-type
-
diff --git a/dev-python/guessit/guessit-2.0.5-r1.ebuild b/dev-python/guessit/guessit-2.0.5-r1.ebuild
deleted file mode 100644
index 821ddeb..00000000
--- a/dev-python/guessit/guessit-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
- <dev-python/python-dateutil-2.5.2[${PYTHON_USEDEP}]
- >=dev-python/rebulk-0.7.1[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- >=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
- dev-python/pytest-capturelog[${PYTHON_USEDEP}]
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=( "${FILESDIR}/${P}-support-noninteractive-shells.patch" )
-
-python_prepare_all() {
- # Disable benchmarks as they require unavailable pytest-benchmark.
- rm guessit/test/test_benchmark.py || die
- sed -i -e "s|'pytest-benchmark',||g" setup.py || die
-
- # Disable unconditional dependency on dev-python/pytest-runner.
- sed -i -e "s|'pytest-runner'||g" setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- esetup.py test
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-16 17:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-12 11:40 [gentoo-commits] repo/gentoo:master commit in: dev-python/guessit/files/, dev-python/guessit/ Ian Delaney
-- strict thread matches above, loose matches on Subject: below --
2016-05-12 11:40 Ian Delaney
2017-01-16 17:55 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox