diff --git a/www/py-flexget/Makefile b/www/py-flexget/Makefile index 60bd9f1a065a..985d83d58c14 100644 --- a/www/py-flexget/Makefile +++ b/www/py-flexget/Makefile @@ -1,50 +1,49 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= flexget -PORTVERSION= 1.2.348 -PORTREVISION= 1 +PORTVERSION= 2.1.15 PORTEPOCH= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= FlexGet-${PORTVERSION} MAINTAINER= wg@FreeBSD.org COMMENT= Program to automate downloading from different sources LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paver>=0:devel/py-paver -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.1.3:textproc/py-feedparser \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy07>=0.7.5:databases/py-sqlalchemy07 \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.2.1:textproc/py-feedparser \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10 \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32 \ - ${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup>4.2.0: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:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy \ - ${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ + ${PYTHON_PKGNAMEPREFIX}Flask>=0.7:www/py-flask \ + ${PYTHON_PKGNAMEPREFIX}Flask-RESTful>=0.3.3:www/py-flask-restful \ + ${PYTHON_PKGNAMEPREFIX}flask-restplus08=0.8.6:www/py-flask-restplus08 \ + ${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}tvrage>0:devel/py-tvrage \ - ${PYTHON_PKGNAMEPREFIX}tmdb3>0:www/py-tmdb3 \ - ${PYTHON_PKGNAMEPREFIX}apscheduler>0:devel/py-apscheduler \ - ${PYTHON_PKGNAMEPREFIX}guessit>=0.9.3:multimedia/py-guessit \ - ${PYTHON_PKGNAMEPREFIX}path.py>=6.2:devel/py-path.py -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock + ${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 -USES= python:2 +USES= python:2.7+ USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include diff --git a/www/py-flexget/distinfo b/www/py-flexget/distinfo index 50f08dd733a1..d94b9db10de8 100644 --- a/www/py-flexget/distinfo +++ b/www/py-flexget/distinfo @@ -1,2 +1,3 @@ -SHA256 (FlexGet-1.2.348.tar.gz) = 083c317aea13243936670ad53b8b01ba8df1cfbe30f4842e9b34845aacda2da7 -SIZE (FlexGet-1.2.348.tar.gz) = 897000 +TIMESTAMP = 1468832032 +SHA256 (FlexGet-2.1.15.tar.gz) = 3fe549d83b7c98297fb5f8a29be61521d5e5a11068e3ce81fd6cbd231d04ed43 +SIZE (FlexGet-2.1.15.tar.gz) = 2270520 diff --git a/www/py-flexget/files/patch-pavement.py b/www/py-flexget/files/patch-pavement.py deleted file mode 100644 index bcdd3a9ebd5d..000000000000 --- a/www/py-flexget/files/patch-pavement.py +++ /dev/null @@ -1,14 +0,0 @@ ---- 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') diff --git a/www/py-flexget/files/patch-requirements.txt b/www/py-flexget/files/patch-requirements.txt new file mode 100644 index 000000000000..126ac2bf9cde --- /dev/null +++ b/www/py-flexget/files/patch-requirements.txt @@ -0,0 +1,16 @@ +--- 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