Index: head/www/py-pywikibot/Makefile =================================================================== --- head/www/py-pywikibot/Makefile (revision 533386) +++ head/www/py-pywikibot/Makefile (revision 533387) @@ -1,51 +1,50 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= pywikibot -DISTVERSION= 3.0.20190722 -PORTREVISION= 1 +DISTVERSION= 3.0.20200405 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Wikipedia bot for Python LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} USES= dos2unix python DOS2UNIX_FILES= setup.py USE_PYTHON= autoplist distutils NO_ARCH= yes OPTIONS_DEFINE= EVENTSTREAMS ISBN PYDOT GOOGLE IRC MWPARSE PILLOW MWOAUTH HTML EVENTSTREAMS_DESC= Support for reading Server Sent Event streams ISBN_DESC= Support for standard numbers and codes via stdnum package PYDOT_DESC= Support for Graphviz via pydot module GOOGLE_DESC= Support for Google search IRC_DESC= Support for IRC MWPARSE_DESC= Support for MediaWiki parser PILLOW_DESC= Support for image processing via pillow module MWOAUTH_DESC= Support for MediaWiki OAuth handshake helper HTML_DESC= Support for HTML/XML Parser for Python EVENTSTREAMS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sseclient>0:www/py-sseclient@${PY_FLAVOR} ISBN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR} PYDOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydot>0:graphics/py-pydot@${PY_FLAVOR} GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google>0:www/py-google@${PY_FLAVOR} IRC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc@${PY_FLAVOR} MWPARSE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwparserfromhell>0:textproc/py-mwparserfromhell@${PY_FLAVOR} PILLOW_RUN_DEPENDS= ${PY_PILLOW} MWOAUTH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwoauth>0:www/py-mwoauth@${PY_FLAVOR} HTML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} .include .if ${PYTHON_REL} < 3000 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${PY_FLAVOR} .endif .include Index: head/www/py-pywikibot/distinfo =================================================================== --- head/www/py-pywikibot/distinfo (revision 533386) +++ head/www/py-pywikibot/distinfo (revision 533387) @@ -1,3 +1,3 @@ -TIMESTAMP = 1564210827 -SHA256 (pywikibot-3.0.20190722.tar.gz) = a0388717038293202ea92eeb7099e8bd87f258304f371a8a8f87a74e233e9cd4 -SIZE (pywikibot-3.0.20190722.tar.gz) = 520375 +TIMESTAMP = 1588186187 +SHA256 (pywikibot-3.0.20200405.tar.gz) = f83e7021b053dd63f4b4781101e75ce46aa37f1cd59e5f939d3cb0a4768d0c19 +SIZE (pywikibot-3.0.20200405.tar.gz) = 529763 Index: head/www/py-pywikibot/files/patch-setup.py =================================================================== --- head/www/py-pywikibot/files/patch-setup.py (revision 533386) +++ head/www/py-pywikibot/files/patch-setup.py (revision 533387) @@ -1,31 +1,41 @@ ---- setup.py.orig 2018-10-20 16:02:34 UTC +--- setup.py.orig 2020-04-29 18:50:22 UTC +++ setup.py -@@ -190,17 +190,17 @@ else: - def get_version(): - """Get a valid pywikibot module version string.""" +@@ -168,22 +168,22 @@ def get_version(name): + @rtype: str + """ version = '3.0' - try: - import subprocess - date = subprocess.check_output( - ['git', 'log', '-1', '--format=%ci']).strip() -- date = date.decode().split(' ')[0].replace('-', '') +- date = date.decode().split(' ', 1)[0].replace('-', '') - version += '.' + date - if 'sdist' not in sys.argv: - version += '.dev0' - except Exception as e: - print(e) -- version += '.dev0' +- from pkg_resources import get_distribution, DistributionNotFound +- try: +- version = get_distribution(name).version +- except DistributionNotFound as e: +- print(e) +- version += '.dev0' + #try: + # import subprocess + # date = subprocess.check_output( + # ['git', 'log', '-1', '--format=%ci']).strip() -+ # date = date.decode().split(' ')[0].replace('-', '') ++ # date = date.decode().split(' ', 1)[0].replace('-', '') + # version += '.' + date + # if 'sdist' not in sys.argv: + # version += '.dev0' + #except Exception as e: + # print(e) -+ # version += '.dev0' ++ # from pkg_resources import get_distribution, DistributionNotFound ++ # try: ++ # version = get_distribution(name).version ++ # except DistributionNotFound as e: ++ # print(e) ++ # version += '.dev0' return version