Attachment #172659 for bug #210984




# $FreeBSD$

PORTNAME=	flexget
PORTVERSION=	2.1.15
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	www python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


LICENSE=	MIT

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=5.2.1:textproc/py-feedparser \
		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10 \
		${PYTHON_PKGNAMEPREFIX}sqlalchemy07>=0.7.5:databases/py-sqlalchemy07 \
		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
		${PYTHON_PKGNAMEPREFIX}beautifulsoup>4.2.0:www/py-beautifulsoup \
		${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup \
		${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:www/py-html5lib \
		${PYTHON_PKGNAMEPREFIX}rss2gen>0:textproc/py-rss2gen \
		${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb \

		${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \
		${PYTHON_PKGNAMEPREFIX}rpyc>0:devel/py-RPyC \
		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
		${PYTHON_PKGNAMEPREFIX}Flask>=0.7:www/py-flask \
		${PYTHON_PKGNAMEPREFIX}Flask-RESTful>=0.3.3:www/py-flask-restful \
		${PYTHON_PKGNAMEPREFIX}flask-restplus=0.8.6:www/py-flask-restplus \
		${PYTHON_PKGNAMEPREFIX}Flask-Cors>=2.1.2:www/py-flask-cors \
		${PYTHON_PKGNAMEPREFIX}Flask-Compress>=1.2.1:www/py-flask-compress \
		${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.3.2:www/py-flask-login \
		${PYTHON_PKGNAMEPREFIX}cherrypy>=3.7.0:www/py-cherrypy \
		${PYTHON_PKGNAMEPREFIX}requests>=2.8.0:www/py-requests \
		${PYTHON_PKGNAMEPREFIX}dateutil<=2.5.2:devel/py-dateutil \
		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema \
		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing \
		${PYTHON_PKGNAMEPREFIX}safe>=0.4:security/py-safe \
		${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \
		${PYTHON_PKGNAMEPREFIX}apscheduler>=3.2.0:devel/py-apscheduler \
		${PYTHON_PKGNAMEPREFIX}guessit>=2.0.4:multimedia/py-guessit \
		${PYTHON_PKGNAMEPREFIX}path.py>=8.1.1:devel/py-path.py \
		${PYTHON_PKGNAMEPREFIX}pathlib>=1.0:devel/py-pathlib \
		${PYTHON_PKGNAMEPREFIX}plumbum>=1.2:sysutils/py-plumbum
TEST_DEPENDS:=	${RUN_DEPENDS} \
		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock

USES=		python:2.7+
USE_PYTHON=	autoplist distutils

regression-test: build

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (FlexGet-1.2.348.tar.gz) = 083c317aea13243936670ad53b8b01ba8df1cfbe30f4842e9b34845aacda2da7	1	TIMESTAMP = 1468832032
2	SIZE (FlexGet-1.2.348.tar.gz) = 897000	2	SHA256 (FlexGet-2.1.15.tar.gz) = 3fe549d83b7c98297fb5f8a29be61521d5e5a11068e3ce81fd6cbd231d04ed43
		3	SIZE (FlexGet-2.1.15.tar.gz) = 2270520




--- pavement.py.orig	2015-09-03 06:12:10 UTC
+++ pavement.py
@@ -25,9 +25,9 @@ options = environment.options
 # guessit 0.10.4 stops supporting python 2.6, the tests also start failing on 2.7
 # Path keeps messing about with case, so anything under 6.2 will be broken now
 install_requires = ['FeedParser>=5.1.3', 'SQLAlchemy >=0.7.5, !=0.9.0, <1.999', 'PyYAML',
-                    'beautifulsoup4>=4.1, !=4.2.0, <4.4', 'html5lib>=0.11', 'PyRSS2Gen', 'pynzb', 'progressbar', 'rpyc',
+                    'beautifulsoup4>=4.1', 'html5lib>=0.11', 'PyRSS2Gen', 'pynzb', 'progressbar', 'rpyc',
                     'jinja2', 'requests>=1.0, !=2.4.0, <2.99', 'python-dateutil!=2.0, !=2.2', 'jsonschema>=2.0',
-                    'python-tvrage', 'tmdb3', 'path.py>=6.2', 'guessit>=0.9.3, <0.10.4', 'apscheduler']
+                    'python-tvrage', 'tmdb3', 'path.py>=6.2', 'guessit>=0.9.3', 'apscheduler']
 if sys.version_info < (2, 7):
     # argparse is part of the standard library in python 2.7+
     install_requires.append('argparse')




--- requirements.txt.orig	2016-07-15 06:12:13 UTC
+++ requirements.txt
@@ -15,11 +15,11 @@ jinja2
 # There is a bug in requests 2.4.0 where it leaks urllib3 exceptions
 requests>=2.8.0, <3.0
 #Guessit requires python-dateutil<=2.5.2
-python-dateutil>=2.5.2
+python-dateutil<=2.5.2
 jsonschema>=2.0
 path.py>=8.1.1
 pathlib>=1.0
-guessit<=2.0.4
+guessit>=2.0.4
 apscheduler>=3.2.0
 # WebUI Requirements
 cherrypy>=3.7.0

Return to bug 210984

Lines 2-10 Link Here

(-)Makefile (-20 / +23 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= flexget	4	PORTNAME= flexget
5	PORTVERSION= 1.2.348	5	PORTVERSION= 2.1.15
6	PORTREVISION= 1
7	PORTEPOCH= 1
8	CATEGORIES= www python	6	CATEGORIES= www python
9	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
10	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 15-26 Link Here
15		13
16	LICENSE= MIT	14	LICENSE= MIT
17		15
18	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paver>=0:devel/py-paver	16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.2.1:textproc/py-feedparser \
19	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.1.3:textproc/py-feedparser \	17	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10 \
20	${PYTHON_PKGNAMEPREFIX}sqlalchemy07>=0.7.5:databases/py-sqlalchemy07 \
21	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \	18	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
22	${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32 \	19	${PYTHON_PKGNAMEPREFIX}beautifulsoup>4.2.0:www/py-beautifulsoup \
23	${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup \
24	${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:www/py-html5lib \	20	${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:www/py-html5lib \
25	${PYTHON_PKGNAMEPREFIX}rss2gen>0:textproc/py-rss2gen \	21	${PYTHON_PKGNAMEPREFIX}rss2gen>0:textproc/py-rss2gen \
26	${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb \	22	${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb \
Lines 27-47 Link Here
27	${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \	23	${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \
28	${PYTHON_PKGNAMEPREFIX}rpyc>0:devel/py-RPyC \	24	${PYTHON_PKGNAMEPREFIX}rpyc>0:devel/py-RPyC \
29	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \	25	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
30	${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \	26	${PYTHON_PKGNAMEPREFIX}Flask>=0.7:www/py-flask \
31	${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy \	27	${PYTHON_PKGNAMEPREFIX}Flask-RESTful>=0.3.3:www/py-flask-restful \
32	${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests \	28	${PYTHON_PKGNAMEPREFIX}flask-restplus=0.8.6:www/py-flask-restplus \
33	${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \	29	${PYTHON_PKGNAMEPREFIX}Flask-Cors>=2.1.2:www/py-flask-cors \
		30	${PYTHON_PKGNAMEPREFIX}Flask-Compress>=1.2.1:www/py-flask-compress \
		31	${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.3.2:www/py-flask-login \
		32	${PYTHON_PKGNAMEPREFIX}cherrypy>=3.7.0:www/py-cherrypy \
		33	${PYTHON_PKGNAMEPREFIX}requests>=2.8.0:www/py-requests \
		34	${PYTHON_PKGNAMEPREFIX}dateutil<=2.5.2:devel/py-dateutil \
34	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema \	35	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema \
35	${PYTHON_PKGNAMEPREFIX}tvrage>0:devel/py-tvrage \	36	${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing \
36	${PYTHON_PKGNAMEPREFIX}tmdb3>0:www/py-tmdb3 \	37	${PYTHON_PKGNAMEPREFIX}safe>=0.4:security/py-safe \
37	${PYTHON_PKGNAMEPREFIX}apscheduler>0:devel/py-apscheduler \	38	${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \
38	${PYTHON_PKGNAMEPREFIX}guessit>=0.9.3:multimedia/py-guessit \	39	${PYTHON_PKGNAMEPREFIX}apscheduler>=3.2.0:devel/py-apscheduler \
39	${PYTHON_PKGNAMEPREFIX}path.py>=6.2:devel/py-path.py	40	${PYTHON_PKGNAMEPREFIX}guessit>=2.0.4:multimedia/py-guessit \
		41	${PYTHON_PKGNAMEPREFIX}path.py>=8.1.1:devel/py-path.py \
		42	${PYTHON_PKGNAMEPREFIX}pathlib>=1.0:devel/py-pathlib \
		43	${PYTHON_PKGNAMEPREFIX}plumbum>=1.2:sysutils/py-plumbum
40	TEST_DEPENDS:= ${RUN_DEPENDS} \	44	TEST_DEPENDS:= ${RUN_DEPENDS} \
41	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \	45	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
42	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
43		46
44	USES= python:2	47	USES= python:2.7+
45	USE_PYTHON= autoplist distutils	48	USE_PYTHON= autoplist distutils
46		49
47	regression-test: build	50	regression-test: build

Lines 1-14 Link Here

(-)files/patch-pavement.py (-14 lines)
1	--- pavement.py.orig 2015-09-03 06:12:10 UTC
2	+++ pavement.py
3	@@ -25,9 +25,9 @@ options = environment.options
4	# guessit 0.10.4 stops supporting python 2.6, the tests also start failing on 2.7
5	# Path keeps messing about with case, so anything under 6.2 will be broken now
6	install_requires = ['FeedParser>=5.1.3', 'SQLAlchemy >=0.7.5, !=0.9.0, <1.999', 'PyYAML',
7	- 'beautifulsoup4>=4.1, !=4.2.0, <4.4', 'html5lib>=0.11', 'PyRSS2Gen', 'pynzb', 'progressbar', 'rpyc',
8	+ 'beautifulsoup4>=4.1', 'html5lib>=0.11', 'PyRSS2Gen', 'pynzb', 'progressbar', 'rpyc',
9	'jinja2', 'requests>=1.0, !=2.4.0, <2.99', 'python-dateutil!=2.0, !=2.2', 'jsonschema>=2.0',
10	- 'python-tvrage', 'tmdb3', 'path.py>=6.2', 'guessit>=0.9.3, <0.10.4', 'apscheduler']
11	+ 'python-tvrage', 'tmdb3', 'path.py>=6.2', 'guessit>=0.9.3', 'apscheduler']
12	if sys.version_info < (2, 7):
13	# argparse is part of the standard library in python 2.7+
14	install_requires.append('argparse')

Line 0 Link Here

(-)files/patch-requirements.txt (+16 lines)
	1	--- requirements.txt.orig 2016-07-15 06:12:13 UTC
	2	+++ requirements.txt
	3	@@ -15,11 +15,11 @@ jinja2
	4	# There is a bug in requests 2.4.0 where it leaks urllib3 exceptions
	5	requests>=2.8.0, <3.0
	6	#Guessit requires python-dateutil<=2.5.2
	7	-python-dateutil>=2.5.2
	8	+python-dateutil<=2.5.2
	9	jsonschema>=2.0
	10	path.py>=8.1.1
	11	pathlib>=1.0
	12	-guessit<=2.0.4
	13	+guessit>=2.0.4
	14	apscheduler>=3.2.0
	15	# WebUI Requirements
	16	cherrypy>=3.7.0