Hello community, here is the log from the commit of package python-ruamel.yaml.convert for openSUSE:Factory checked in at 2019-09-11 10:35:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ruamel.yaml.convert (Old) and /work/SRC/openSUSE:Factory/.python-ruamel.yaml.convert.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ruamel.yaml.convert" Wed Sep 11 10:35:40 2019 rev:2 rq:729785 version:0.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-ruamel.yaml.convert/python-ruamel.yaml.convert.changes 2019-07-22 12:19:46.579674035 +0200 +++ /work/SRC/openSUSE:Factory/.python-ruamel.yaml.convert.new.7948/python-ruamel.yaml.convert.changes 2019-09-11 10:35:41.679290978 +0200 @@ -1,0 +2,6 @@ +Tue Sep 10 10:33:27 UTC 2019 - Tomáš Chvátal <tchva...@suse.com> + +- Update to 0.3.2: + * no upstream changelog + +------------------------------------------------------------------- Old: ---- ruamel.yaml.convert-0.3.1.tar.gz New: ---- ruamel.yaml.convert-0.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ruamel.yaml.convert.spec ++++++ --- /var/tmp/diff_new_pack.jiBmp4/_old 2019-09-11 10:35:42.355290781 +0200 +++ /var/tmp/diff_new_pack.jiBmp4/_new 2019-09-11 10:35:42.359290780 +0200 @@ -12,27 +12,28 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-ruamel.yaml.convert -Version: 0.3.1 +Version: 0.3.2 Release: 0 -License: MIT Summary: Data format conversion routines to and from YAML -Url: https://bitbucket.org/ruamel/yaml.convert +License: MIT Group: Development/Languages/Python +Url: https://bitbucket.org/ruamel/yaml.convert Source: https://files.pythonhosted.org/packages/source/r/ruamel.yaml.convert/ruamel.yaml.convert-%{version}.tar.gz -BuildRequires: python-rpm-macros BuildRequires: %{python_module ruamel.base >= 1.0.0+post1} BuildRequires: %{python_module ruamel.yaml} BuildRequires: %{python_module setuptools} BuildRequires: fdupes +BuildRequires: python-rpm-macros # 1.0.0+post1 needed to depend on revised base namespace technique +Requires: python-python-dateutil Requires: python-ruamel.base >= 1.0.0+post1 Requires: python-ruamel.yaml -Requires: python-python-dateutil Recommends: python-beautifulsoup4 BuildArch: noarch ++++++ ruamel.yaml.convert-0.3.1.tar.gz -> ruamel.yaml.convert-0.3.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.convert-0.3.1/PKG-INFO new/ruamel.yaml.convert-0.3.2/PKG-INFO --- old/ruamel.yaml.convert-0.3.1/PKG-INFO 2019-07-12 08:57:25.000000000 +0200 +++ new/ruamel.yaml.convert-0.3.2/PKG-INFO 2019-08-08 09:11:17.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ruamel.yaml.convert -Version: 0.3.1 +Version: 0.3.2 Summary: data format conversion routines to/from YAML Home-page: https://bitbucket.org/ruamel/yaml.convert Author: Anthon van der Neut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.convert-0.3.1/__init__.py new/ruamel.yaml.convert-0.3.2/__init__.py --- old/ruamel.yaml.convert-0.3.1/__init__.py 2019-07-12 08:56:49.000000000 +0200 +++ new/ruamel.yaml.convert-0.3.2/__init__.py 2019-08-08 09:11:13.000000000 +0200 @@ -9,26 +9,28 @@ _package_data = dict( full_package_name='ruamel.yaml.convert', - version_info=(0, 3, 1), - __version__='0.3.1', + version_info=(0, 3, 2), + __version__='0.3.2', author='Anthon van der Neut', author_email='a.van.der.n...@ruamel.eu', description='data format conversion routines to/from YAML', entry_points=None, - install_requires=['ruamel.yaml', 'python-dateutil'], - extras_require={'all': ['python-dateutil', 'beautifulsoup4'], 'csv': ['python-dateutil'], 'html': ['beautifulsoup4']}, + install_requires=['ruamel.yaml>=0.16.1', 'python-dateutil'], + extras_require={ + 'all': ['python-dateutil', 'beautifulsoup4'], + 'csv': ['python-dateutil'], + 'html': ['beautifulsoup4'], + }, since=2015, nested=True, - status='α', + status='alpha', universal=True, - tox=dict( - env='23', - deps=['python-dateutil', 'beautifulsoup4'], - ), + tox=dict(env='23', deps=['python-dateutil', 'beautifulsoup4']), + print_allowed=True, ) version_info = _package_data['version_info'] __version__ = _package_data['__version__'] -from .syncjson import * # NOQA +from .syncjson import * # NOQA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.convert-0.3.1/csv_yaml.py new/ruamel.yaml.convert-0.3.2/csv_yaml.py --- old/ruamel.yaml.convert-0.3.1/csv_yaml.py 2017-06-30 06:41:17.000000000 +0200 +++ new/ruamel.yaml.convert-0.3.2/csv_yaml.py 2019-07-12 09:03:39.000000000 +0200 @@ -2,6 +2,7 @@ from __future__ import print_function +import sys import csv import dateutil.parser import ruamel.yaml @@ -31,7 +32,7 @@ header = line continue data.append(ruamel.yaml.comments.CommentedMap(zip(header, line))) - print(ruamel.yaml.round_trip_dump(data)) + ruamel.yaml.round_trip_dump(data, sys.stdout) def process_line(self, line, strip=False): """convert lines, trying, int, float, date""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.convert-0.3.1/ruamel.yaml.convert.egg-info/PKG-INFO new/ruamel.yaml.convert-0.3.2/ruamel.yaml.convert.egg-info/PKG-INFO --- old/ruamel.yaml.convert-0.3.1/ruamel.yaml.convert.egg-info/PKG-INFO 2019-07-12 08:57:25.000000000 +0200 +++ new/ruamel.yaml.convert-0.3.2/ruamel.yaml.convert.egg-info/PKG-INFO 2019-08-08 09:11:17.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ruamel.yaml.convert -Version: 0.3.1 +Version: 0.3.2 Summary: data format conversion routines to/from YAML Home-page: https://bitbucket.org/ruamel/yaml.convert Author: Anthon van der Neut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.convert-0.3.1/ruamel.yaml.convert.egg-info/requires.txt new/ruamel.yaml.convert-0.3.2/ruamel.yaml.convert.egg-info/requires.txt --- old/ruamel.yaml.convert-0.3.1/ruamel.yaml.convert.egg-info/requires.txt 2019-07-12 08:57:25.000000000 +0200 +++ new/ruamel.yaml.convert-0.3.2/ruamel.yaml.convert.egg-info/requires.txt 2019-08-08 09:11:17.000000000 +0200 @@ -1,4 +1,4 @@ -ruamel.yaml +ruamel.yaml>=0.16.1 python-dateutil [all] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.convert-0.3.1/setup.py new/ruamel.yaml.convert-0.3.2/setup.py --- old/ruamel.yaml.convert-0.3.1/setup.py 2019-07-12 08:57:25.000000000 +0200 +++ new/ruamel.yaml.convert-0.3.2/setup.py 2019-08-08 09:11:17.000000000 +0200 @@ -1,5 +1,6 @@ # # header # coding: utf-8 +# dd: 20190807 from __future__ import print_function, absolute_import, division, unicode_literals @@ -19,6 +20,8 @@ from setuptools.command import install_lib # NOQA from setuptools.command.sdist import sdist as _sdist # NOQA +from setuptools.namespaces import Installer as NameSpaceInstaller # NOQA + if __name__ != '__main__': raise NotImplementedError('should never include setup.py') @@ -306,80 +309,6 @@ _bdist_wheel_available = False -class InMemoryZipFile(object): - def __init__(self, file_name=None): - try: - from cStringIO import StringIO - except ImportError: - from io import BytesIO as StringIO - import zipfile - - self.zip_file = zipfile - # Create the in-memory file-like object - self._file_name = file_name - self.in_memory_data = StringIO() - # Create the in-memory zipfile - self.in_memory_zip = self.zip_file.ZipFile( - self.in_memory_data, 'w', self.zip_file.ZIP_DEFLATED, False - ) - self.in_memory_zip.debug = 3 - - def append(self, filename_in_zip, file_contents): - """Appends a file with name filename_in_zip and contents of - file_contents to the in-memory zip.""" - self.in_memory_zip.writestr(filename_in_zip, file_contents) - return self # so you can daisy-chain - - def write_to_file(self, filename): - """Writes the in-memory zip to a file.""" - # Mark the files as having been created on Windows so that - # Unix permissions are not inferred as 0000 - for zfile in self.in_memory_zip.filelist: - zfile.create_system = 0 - self.in_memory_zip.close() - with open(filename, 'wb') as f: - f.write(self.in_memory_data.getvalue()) - - def __enter__(self): - return self - - def __exit__(self, exc_type, exc_value, traceback): - if self._file_name is None: - return - self.write_to_file(self._file_name) - - def delete_from_zip_file(self, pattern=None, file_names=None): - """ - zip_file can be a string or a zipfile.ZipFile object, the latter will be closed - any name in file_names is deleted, all file_names provided have to be in the ZIP - archive or else an IOError is raised - """ - if pattern and isinstance(pattern, string_type): - import re - - pattern = re.compile(pattern) - if file_names: - if not isinstance(file_names, list): - file_names = [file_names] - else: - file_names = [] - with self.zip_file.ZipFile(self._file_name) as zf: - for l in zf.infolist(): - if l.filename in file_names: - file_names.remove(l.filename) - continue - if pattern and pattern.match(l.filename): - continue - self.append(l.filename, zf.read(l)) - if file_names: - raise IOError( - '[Errno 2] No such file{}: {}'.format( - "" if len(file_names) == 1 else 's', - ', '.join([repr(f) for f in file_names]), - ) - ) - - class NameSpacePackager(object): def __init__(self, pkg_data): assert isinstance(pkg_data, dict) @@ -388,6 +317,8 @@ self._split = None self.depth = self.full_package_name.count('.') self.nested = self._pkg_data.get('nested', False) + if self.nested: + NameSpaceInstaller.install_namespaces = lambda x: None self.command = None self.python_version() self._pkg = [None, None] # required and pre-installable packages @@ -749,14 +680,14 @@ ep = self._pkg_data.get('extras_require') return ep - @property - def data_files(self): - df = self._pkg_data.get('data_files', []) - if self.has_mit_lic(): - df.append('LICENSE') - if not df: - return None - return [('.', df)] + # @property + # def data_files(self): + # df = self._pkg_data.get('data_files', []) + # if self.has_mit_lic(): + # df.append('LICENSE') + # if not df: + # return None + # return [('.', df)] @property def package_data(self): @@ -766,6 +697,8 @@ df.append('LICENSE') # but don't install it exclude_files.append('LICENSE') + if self._pkg_data.get('binary_only', False): + exclude_files.append('__init__.py') debug('testing<<<<<') if 'Typing :: Typed' in self.classifiers: debug('appending') @@ -996,24 +929,6 @@ pass if nsp.wheel(kw, setup): - if nsp.nested and 'bdist_wheel' in sys.argv: - try: - d = sys.argv[sys.argv.index('-d') + 1] - except ValueError: - dist_base = os.environ.get('PYDISTBASE') - if dist_base: - d = os.path.join(dist_base, nsp.full_package_name) - else: - d = 'dist' - for x in os.listdir(d): - dashed_vs = '-' + version_str + '-' - if x.endswith('.whl') and dashed_vs in x: - # remove .pth file from the wheel - full_name = os.path.join(d, x) - print('patching .pth from', full_name) - with InMemoryZipFile(full_name) as imz: - imz.delete_from_zip_file(nsp.full_package_name + '.*.pth') - break return for x in ['-c', 'egg_info', '--egg-base', 'pip-egg-info']: if x not in sys.argv: @@ -1038,16 +953,6 @@ break try_dir = os.path.dirname(try_dir) setup(**kw) - if nsp.nested and sys.argv[:2] == ['-c', 'bdist_wheel']: - d = sys.argv[sys.argv.index('-d') + 1] - for x in os.listdir(d): - if x.endswith('.whl'): - # remove .pth file from the wheel - full_name = os.path.join(d, x) - print('patching .pth from', full_name) - with InMemoryZipFile(full_name) as imz: - imz.delete_from_zip_file(nsp.full_package_name + '.*.pth') - break main()