Hello community, here is the log from the commit of package python-py2pack for openSUSE:Factory checked in at 2013-05-03 13:46:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-py2pack (Old) and /work/SRC/openSUSE:Factory/.python-py2pack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-py2pack" Changes: -------- --- /work/SRC/openSUSE:Factory/python-py2pack/python-py2pack.changes 2013-05-02 11:42:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-py2pack.new/python-py2pack.changes 2013-05-03 13:46:05.000000000 +0200 @@ -1,0 +2,12 @@ +Fri May 3 10:25:01 UTC 2013 - speilicke@suse.com + +- Update to version 0.4.3.4: + + catch more doc files + +------------------------------------------------------------------- +Thu May 2 12:38:35 UTC 2013 - speilicke@suse.com + +- Update to version 0.4.3.3: + + Various bugfixes + +------------------------------------------------------------------- Old: ---- py2pack-0.4.3.2.tar.gz New: ---- py2pack-0.4.3.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-py2pack.spec ++++++ --- /var/tmp/diff_new_pack.hg7SWh/_old 2013-05-03 13:46:07.000000000 +0200 +++ /var/tmp/diff_new_pack.hg7SWh/_new 2013-05-03 13:46:07.000000000 +0200 @@ -16,7 +16,7 @@ # Name: python-py2pack -Version: 0.4.3.2 +Version: 0.4.3.4 Release: 0 Url: http://github.com/saschpe/py2pack Summary: Generate distribution packages from Python packages on PyPI ++++++ py2pack-0.4.3.2.tar.gz -> py2pack-0.4.3.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py2pack-0.4.3.2/PKG-INFO new/py2pack-0.4.3.4/PKG-INFO --- old/py2pack-0.4.3.2/PKG-INFO 2013-04-29 15:18:13.000000000 +0200 +++ new/py2pack-0.4.3.4/PKG-INFO 2013-05-03 12:24:21.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: py2pack -Version: 0.4.3.2 +Version: 0.4.3.4 Summary: Generate distribution packages from Python packages on PyPI Home-page: http://github.com/saschpe/py2pack Author: Sascha Peilicke diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py2pack-0.4.3.2/py2pack/py2pack.py new/py2pack-0.4.3.4/py2pack/py2pack.py --- old/py2pack-0.4.3.2/py2pack/py2pack.py 2013-04-29 15:17:51.000000000 +0200 +++ new/py2pack-0.4.3.4/py2pack/py2pack.py 2013-05-03 12:23:40.000000000 +0200 @@ -37,7 +37,7 @@ warnings.filterwarnings('ignore', 'Module argparse was already imported') # Filter a UserWarning from Jinja2 import jinja2 -__version__ = '0.4.3.2' +__version__ = '0.4.3.4' class ProxiedTransport(xmlrpclib.Transport): @@ -57,7 +57,7 @@ pypi = xmlrpclib.ServerProxy('http://python.org/pypi') # XML RPC connection to PyPI env = jinja2.Environment(loader=jinja2.FileSystemLoader(TEMPLATE_DIR)) # Jinja2 template environment -SPDX_LICENSES_FILE = 'py2pack/suse_spdx_license_map.p' +SPDX_LICENSES_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'suse_spdx_license_map.p') # absolute template path SDPX_LICENSES = pickle.load(open(SPDX_LICENSES_FILE, 'rb')) @@ -93,33 +93,28 @@ def _augment_data_from_tarball(args, filename, data): setup_filename = "{0}-{1}/setup.py".format(args.name, args.version) - docs_re = re.compile("{0}-{1}\/(AUTHOR|CHANGES|COPYING|LICENSE|NEWS|README(?:\.\w+)?)".format(args.name, args.version), re.IGNORECASE) + docs_re = re.compile("{0}-{1}\/((?:AUTHOR|ChangeLog|CHANGES|COPYING|LICENSE|NEWS|README).*)".format(args.name, args.version), re.IGNORECASE) if tarfile.is_tarfile(filename): with tarfile.open(filename) as f: + names = f.getnames() for line in f.extractfile(setup_filename): if "ext_modules" in line: # tarball contains C/C++ extension data["is_extension"] = True - for name in f.getnames(): - match = re.match(docs_re, name) - if match: - print "DOC", match.groups() - if not "doc_files" in data: - data["doc_files"] = [] - data["doc_files"].append(match.group(1)) elif zipfile.is_zipfile(filename): with zipfile.ZipFile(filename) as f: + names = f.namelist() with f.open(setup_filename) as s: for line in s: if "ext_modules" in line: # tarball contains C/C++ extension data["is_extension"] = True - for name in f.namelist(): - match = re.match(docs_re, name) - if match: - print "DOC", match.groups() - if not "doc_files" in data: - data["doc_files"] = [] - data["doc_files"].append(match.group(1)) + + for name in names: + match = re.match(docs_re, name) + if match: + if not "doc_files" in data: + data["doc_files"] = [] + data["doc_files"].append(match.group(1)) def generate(args): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py2pack-0.4.3.2/py2pack.egg-info/PKG-INFO new/py2pack-0.4.3.4/py2pack.egg-info/PKG-INFO --- old/py2pack-0.4.3.2/py2pack.egg-info/PKG-INFO 2013-04-29 15:18:13.000000000 +0200 +++ new/py2pack-0.4.3.4/py2pack.egg-info/PKG-INFO 2013-05-03 12:24:19.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: py2pack -Version: 0.4.3.2 +Version: 0.4.3.4 Summary: Generate distribution packages from Python packages on PyPI Home-page: http://github.com/saschpe/py2pack Author: Sascha Peilicke -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org