Date: Wed, 29 Apr 2020 19:06:22 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533387 - in head/www/py-pywikibot: . files Message-ID: <202004291906.03TJ6M4j023848@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Wed Apr 29 19:06:22 2020 New Revision: 533387 URL: https://svnweb.freebsd.org/changeset/ports/533387 Log: www/py-pywikibot: Update 3.0.20190722 -> 3.0.20200405 Modified: head/www/py-pywikibot/Makefile head/www/py-pywikibot/distinfo head/www/py-pywikibot/files/patch-setup.py Modified: head/www/py-pywikibot/Makefile ============================================================================== --- head/www/py-pywikibot/Makefile Wed Apr 29 19:05:35 2020 (r533386) +++ head/www/py-pywikibot/Makefile Wed Apr 29 19:06:22 2020 (r533387) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pywikibot -DISTVERSION= 3.0.20190722 -PORTREVISION= 1 +DISTVERSION= 3.0.20200405 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/www/py-pywikibot/distinfo ============================================================================== --- head/www/py-pywikibot/distinfo Wed Apr 29 19:05:35 2020 (r533386) +++ head/www/py-pywikibot/distinfo Wed Apr 29 19:06:22 2020 (r533387) @@ -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 Modified: head/www/py-pywikibot/files/patch-setup.py ============================================================================== --- head/www/py-pywikibot/files/patch-setup.py Wed Apr 29 19:05:35 2020 (r533386) +++ head/www/py-pywikibot/files/patch-setup.py Wed Apr 29 19:06:22 2020 (r533387) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004291906.03TJ6M4j023848>