svn commit: r535963 - in head/www/py-flexget: . files

[Jan Beich]

Author: jbeich
Date: Wed May 20 02:17:01 2020
New Revision: 535963
URL: https://svnweb.freebsd.org/changeset/ports/535963

Log:
  www/py-flexget: chase r535770 by dropping workaround
  
  ===>   py37-flexget-2.21.35,1 depends on package: py37-guessit<3.0.0 - not found
  *** Error code 1
  
  $ flexget execute
  Traceback (most recent call last):
    File "/usr/local/bin/flexget", line 6, in <module>
      from pkg_resources import load_entry_point
    File "/usr/local/lib/python2.7/site-packages/pkg_resources/__init__.py", line 3251, in <module>
      @_call_aside
    File "/usr/local/lib/python2.7/site-packages/pkg_resources/__init__.py", line 3235, in _call_aside
      f(*args, **kwargs)
    File "/usr/local/lib/python2.7/site-packages/pkg_resources/__init__.py", line 3264, in _initialize_master_working_set
      working_set = WorkingSet._build_master()
    File "/usr/local/lib/python2.7/site-packages/pkg_resources/__init__.py", line 585, in _build_master
      return cls._build_from_requirements(__requires__)
    File "/usr/local/lib/python2.7/site-packages/pkg_resources/__init__.py", line 598, in _build_from_requirements
      dists = ws.resolve(reqs, Environment())
    File "/usr/local/lib/python2.7/site-packages/pkg_resources/__init__.py", line 786, in resolve
      raise DistributionNotFound(req, requirers)
  pkg_resources.DistributionNotFound: The 'guessit<3.0.0' distribution was not found and is required by FlexGet
  
  PR:		246543

Deleted:
  head/www/py-flexget/files/patch-01-guessit-2.1.4
Modified:
  head/www/py-flexget/Makefile   (contents, props changed)
  head/www/py-flexget/files/patch-requirements.txt   (contents, props changed)

Modified: head/www/py-flexget/Makefile
==============================================================================
--- head/www/py-flexget/Makefile	Wed May 20 01:52:05 2020	(r535962)
+++ head/www/py-flexget/Makefile	Wed May 20 02:17:01 2020	(r535963)
@@ -3,6 +3,7 @@
 
 PORTNAME=	flexget
 PORTVERSION=	2.21.35
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -26,7 +27,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy12>0:dat
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=4.2:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}progressbar>=2.5:misc/py-progressbar@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}guessit<3.0.0:multimedia/py-guessit@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}guessit>=3.0.3:multimedia/py-guessit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zxcvbn>0:security/py-zxcvbn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plumbum>=1.2:sysutils/py-plumbum@${PY_FLAVOR} \

Modified: head/www/py-flexget/files/patch-requirements.txt
==============================================================================
--- head/www/py-flexget/files/patch-requirements.txt	Wed May 20 01:52:05 2020	(r535962)
+++ head/www/py-flexget/files/patch-requirements.txt	Wed May 20 02:17:01 2020	(r535963)
@@ -1,6 +1,6 @@
 --- requirements.txt.orig	2019-05-25 02:03:39 UTC
 +++ requirements.txt
-@@ -7,8 +7,8 @@ html5lib>=0.11
+@@ -7,15 +7,15 @@ html5lib>=0.11
  PyRSS2Gen
  pynzb
  #PY3 progressbar
@@ -11,6 +11,14 @@
  # There is a bug in requests 2.4.0 where it leaks urllib3 exceptions
  requests>=2.20.0
  python-dateutil
+ jsonschema>=2.0
+ path.py>=10.6
+ pathlib>=1.0; python_version<'3.4'
+-guessit==3.0.3
++guessit>=3.0.3
+ rebulk>=0.9.0
+ apscheduler>=3.2.0
+ terminaltables>=3.1.0
 @@ -24,11 +24,11 @@ colorclass>=2.2.0
  cherrypy>=3.7.0
  flask>=0.7