Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-yamlloader for
openSUSE:Factory checked in at 2021-10-20 20:23:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-yamlloader (Old)
and /work/SRC/openSUSE:Factory/.python-yamlloader.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-yamlloader"
Wed Oct 20 20:23:28 2021 rev:3 rq:925739 version:1.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-yamlloader/python-yamlloader.changes
2021-04-26 16:39:01.834018927 +0200
+++
/work/SRC/openSUSE:Factory/.python-yamlloader.new.1890/python-yamlloader.changes
2021-10-20 20:24:14.513376505 +0200
@@ -1,0 +2,7 @@
+Sat Oct 16 19:36:26 UTC 2021 - Dirk M??ller <[email protected]>
+
+- update to 1.1.0:
+ * format to black
+ * Changed imports of own modules to be relative
+
+-------------------------------------------------------------------
Old:
----
yamlloader-1.0.0.tar.gz
New:
----
yamlloader-1.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-yamlloader.spec ++++++
--- /var/tmp/diff_new_pack.K22yhm/_old 2021-10-20 20:24:14.933376764 +0200
+++ /var/tmp/diff_new_pack.K22yhm/_new 2021-10-20 20:24:14.933376764 +0200
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-yamlloader
-Version: 1.0.0
+Version: 1.1.0
Release: 0
License: MIT
Summary: Ordered YAML loader and dumper for PyYAML
++++++ yamlloader-1.0.0.tar.gz -> yamlloader-1.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yamlloader-1.0.0/PKG-INFO
new/yamlloader-1.1.0/PKG-INFO
--- old/yamlloader-1.0.0/PKG-INFO 2021-03-03 19:07:27.044849400 +0100
+++ new/yamlloader-1.1.0/PKG-INFO 2021-07-13 11:21:14.804351800 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: yamlloader
-Version: 1.0.0
+Version: 1.1.0
Summary: Ordered YAML loader and dumper for PyYAML.
Home-page: https://github.com/Phynix/yamlloader
Author: Jonas Eschle "Mayou36", Johannes Lade "SebastianJL"
@@ -9,122 +9,6 @@
Maintainer-email: [email protected]
License: MIT License
Download-URL: https://github.com/Phynix/yamlloader
-Description: .. image::
https://travis-ci.org/Phynix/yamlloader.svg?branch=master
- :target: https://travis-ci.org/Phynix/yamlloader
- .. image:: https://img.shields.io/pypi/pyversions/yamlloader.svg
- :target: https://pypi.org/project/yamlloader/
- .. image::
https://landscape.io/github/Phynix/yamlloader/master/landscape.svg?style=flat
- :target: https://landscape.io/github/Phynix/yamlloader/master
- :alt: Code Health
- .. image::
https://coveralls.io/repos/github/Phynix/yamlloader/badge.svg
- :target: https://coveralls.io/github/Phynix/yamlloader
-
- yamlloader
- ==========
-
-
- This module provides loaders and dumpers for PyYAML. Currently, an
OrderedDict loader/dumper is
- implemented, allowing to keep items order
- when loading resp. dumping a file from/to an OrderedDict (Python 3.7:
Also regular dicts are supported and are the default items to be loaded to. As
of Python 3.7 preservation of insertion order is a language feature of regular
dicts.)
-
- This project was originally mirrored from
- `yamlordereddict
<https://github.com/fmenabe/python-yamlordereddictloader>`_
- Many thanks to the original author Fran??ois M??nab??!
- The library contains several improvements including automated testing
and
- the much faster C-versions of the Loaders/Dumpers.
-
-
- `API Documentation <https://phynix.github.io/yamlloader/index.html>`_
-
-
- Install
- -------
- There is a pip and a conda version available
-
- .. code-block:: bash
-
- $ pip install yamlloader
-
- or
-
- .. code-block:: bash
-
- $ conda install yamlloader -c phynix # it is also in conda-forge
-
-
- But does [your special case here] also work?
- --------------------------------------------
-
- Tests are run continuously using randomly generated yaml files.
- Also, there are no fails to be expected.
-
- Still, if you are concerned that *your* special case may breaks in the
future, please
- add your own tests as `test_ext_anyname.py` under `tests/` or let us
know about your needs.
- This guarantees that no code will be added that breaks *your* case.
-
-
- C vs non-C version
- ------------------
-
- A significant speedup can be reached by replacing the Loader* and
Dumper* classes by CLoader*
- and CDumper*. The package hereby relies on the implementations from
PyYAML. If they have not
- been compiled, *yamlloader* **automatically** falls back to the non-C
versions.
-
- Therefore using the C-version is safe: if it is not available, the
pure Python version is
- automatically used.
-
- Usage examples
- ==============
-
-
- Loader usage
- ------------
-
- .. code-block:: python
-
- import yaml
- import yamlloader
-
- with open('myfile.yml') as yaml_file:
- data = yaml.load(yaml_file,
- Loader=yamlloader.ordereddict.CLoader)
- # CLoader is faster than Loader
-
- **Note:** For using the safe loader (which takes standard YAML tags
and does
- not construct arbitrary Python objects), replace
``yamlloader.ordereddict.CLoader`` by
- ``yamlloader.ordereddict.CSafeLoader``.
-
- Dumper usage
- ------------
-
- .. code-block:: python
-
- import yaml
- import yamlloader
- from collections import OrderedDict
-
- data = OrderedDict([('key1', 'val1'),
- ('key2', OrderedDict([('key21', 'val21'),
- ('key22', 'val22')]))])
-
- with open('myfile.yaml', 'w') as yaml_file:
- yaml.dump(data, yaml_file,
- Dumper=yamlloader.ordereddict.CDumper)
-
- **Note:** For using the safe dumper (which produce standard YAML tags
and does
- not represent arbitrary Python objects), replace
``yamlloader.ordereddict.CDumper`` by
- ``yamlloader.ordereddict.CSafeDumper``.
-
-
- FAQ
- ===
-
- The C version does not work
- ---------------------------
- Check if yaml.cyaml exists. If not, the cyaml module was not compiled
during the installation of
- yaml (pyyaml). Make sure that cython is installed (`pip install
Cython`) and the yaml.h file is
- there (apt: libyaml-dev).
-
Keywords: YAML,loader,dumper,ordered,OrderedDict,pyyaml
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -141,3 +25,123 @@
Classifier: Topic :: Utilities
Requires-Python: >=3.6
Provides-Extra: dev
+License-File: LICENSE
+
+.. image:: https://travis-ci.org/Phynix/yamlloader.svg?branch=master
+ :target: https://travis-ci.org/Phynix/yamlloader
+.. image:: https://img.shields.io/pypi/pyversions/yamlloader.svg
+ :target: https://pypi.org/project/yamlloader/
+.. image::
https://landscape.io/github/Phynix/yamlloader/master/landscape.svg?style=flat
+ :target: https://landscape.io/github/Phynix/yamlloader/master
+ :alt: Code Health
+.. image:: https://coveralls.io/repos/github/Phynix/yamlloader/badge.svg
+ :target: https://coveralls.io/github/Phynix/yamlloader
+
+yamlloader
+==========
+
+
+This module provides loaders and dumpers for PyYAML. Currently, an OrderedDict
loader/dumper is
+implemented, allowing to keep items order
+when loading resp. dumping a file from/to an OrderedDict (Python 3.7+: Also
regular dicts are supported and are the default items to be loaded to. As of
Python 3.7 preservation of insertion order is a language feature of regular
dicts.)
+
+This project was originally mirrored from
+`yamlordereddict <https://github.com/fmenabe/python-yamlordereddictloader>`_
+Many thanks to the original author Fran??ois M??nab??!
+The library contains several improvements including automated testing and
+the much faster C-versions of the Loaders/Dumpers.
+
+
+`API Documentation <https://yamlloader.readthedocs.io/>`_
+
+
+Install
+-------
+There is a pip and a conda version available
+
+.. code-block:: bash
+
+ $ pip install yamlloader
+
+or
+
+.. code-block:: bash
+
+ $ conda install yamlloader -c conda-forge
+
+
+But does [your special case here] also work?
+--------------------------------------------
+
+Tests are run continuously using randomly generated yaml files.
+Also, there are no fails to be expected.
+
+Still, if you are concerned that *your* special case may breaks in the future,
please
+add your own tests as `test_ext_anyname.py` under `tests/` or let us know
about your needs.
+This guarantees that no code will be added that breaks *your* case.
+
+
+C vs non-C version
+------------------
+
+A significant speedup can be reached by replacing the Loader* and Dumper*
classes by CLoader*
+and CDumper*. The package hereby relies on the implementations from PyYAML. If
they have not
+been compiled, *yamlloader* **automatically** falls back to the non-C versions.
+
+Therefore using the C-version is safe: if it is not available, the pure Python
version is
+automatically used.
+
+Usage examples
+==============
+
+
+Loader usage
+------------
+
+.. code-block:: python
+
+ import yaml
+ import yamlloader
+
+ with open('myfile.yml') as yaml_file:
+ data = yaml.load(yaml_file,
+ Loader=yamlloader.ordereddict.CLoader)
+ # CLoader is faster than Loader
+
+**Note:** For using the safe loader (which takes standard YAML tags and does
+not construct arbitrary Python objects), replace
``yamlloader.ordereddict.CLoader`` by
+``yamlloader.ordereddict.CSafeLoader``.
+
+Dumper usage
+------------
+
+.. code-block:: python
+
+ import yaml
+ import yamlloader
+ from collections import OrderedDict
+
+ data = OrderedDict([('key1', 'val1'),
+ ('key2', OrderedDict([('key21', 'val21'),
+ ('key22', 'val22')]))])
+
+ with open('myfile.yaml', 'w') as yaml_file:
+ yaml.dump(data, yaml_file,
+ Dumper=yamlloader.ordereddict.CDumper)
+
+**Note:** For using the safe dumper (which produce standard YAML tags and does
+not represent arbitrary Python objects), replace
``yamlloader.ordereddict.CDumper`` by
+``yamlloader.ordereddict.CSafeDumper``.
+
+
+FAQ
+===
+
+C version not working
+---------------------------
+If the C version is not working (it falls back by default to a non-C version),
+check if yaml.cyaml exists. If not, the cyaml module was not compiled during
the installation of
+yaml (pyyaml). Make sure that cython is installed (`pip install Cython`) and
the yaml.h file is
+there (apt: libyaml-dev).
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yamlloader-1.0.0/README.rst
new/yamlloader-1.1.0/README.rst
--- old/yamlloader-1.0.0/README.rst 2021-03-03 18:49:25.000000000 +0100
+++ new/yamlloader-1.1.0/README.rst 2021-07-13 11:21:06.000000000 +0200
@@ -14,7 +14,7 @@
This module provides loaders and dumpers for PyYAML. Currently, an OrderedDict
loader/dumper is
implemented, allowing to keep items order
-when loading resp. dumping a file from/to an OrderedDict (Python 3.7: Also
regular dicts are supported and are the default items to be loaded to. As of
Python 3.7 preservation of insertion order is a language feature of regular
dicts.)
+when loading resp. dumping a file from/to an OrderedDict (Python 3.7+: Also
regular dicts are supported and are the default items to be loaded to. As of
Python 3.7 preservation of insertion order is a language feature of regular
dicts.)
This project was originally mirrored from
`yamlordereddict <https://github.com/fmenabe/python-yamlordereddictloader>`_
@@ -23,7 +23,7 @@
the much faster C-versions of the Loaders/Dumpers.
-`API Documentation <https://phynix.github.io/yamlloader/index.html>`_
+`API Documentation <https://yamlloader.readthedocs.io/>`_
Install
@@ -38,7 +38,7 @@
.. code-block:: bash
- $ conda install yamlloader -c phynix # it is also in conda-forge
+ $ conda install yamlloader -c conda-forge
But does [your special case here] also work?
@@ -108,8 +108,9 @@
FAQ
===
-The C version does not work
+C version not working
---------------------------
-Check if yaml.cyaml exists. If not, the cyaml module was not compiled during
the installation of
+If the C version is not working (it falls back by default to a non-C version),
+check if yaml.cyaml exists. If not, the cyaml module was not compiled during
the installation of
yaml (pyyaml). Make sure that cython is installed (`pip install Cython`) and
the yaml.h file is
there (apt: libyaml-dev).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yamlloader-1.0.0/pyproject.toml
new/yamlloader-1.1.0/pyproject.toml
--- old/yamlloader-1.0.0/pyproject.toml 1970-01-01 01:00:00.000000000 +0100
+++ new/yamlloader-1.1.0/pyproject.toml 2021-07-13 11:21:06.000000000 +0200
@@ -0,0 +1,9 @@
+[build-system]
+requires = [
+ "setuptools>=42",
+# "setuptools_scm[toml]>=3.4",
+# "setuptools_scm_git_archive",
+ "wheel"
+]
+
+build-backend = "setuptools.build_meta"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yamlloader-1.0.0/setup.py
new/yamlloader-1.1.0/setup.py
--- old/yamlloader-1.0.0/setup.py 2021-03-03 18:49:25.000000000 +0100
+++ new/yamlloader-1.1.0/setup.py 2021-07-13 11:21:06.000000000 +0200
@@ -1,53 +1,51 @@
-# -*- coding: utf-8 -*-
-from __future__ import print_function, division, absolute_import
-
import os
-import io
+
from setuptools import setup
here = os.path.abspath(os.path.dirname(__file__))
-with io.open(os.path.join(here, 'requirements.txt')) as f:
- requirements = f.read().split('\n')
+with open(os.path.join(here, "requirements.txt")) as f:
+ requirements = f.read().split("\n")
def long_description():
"""Load README.rst."""
- with io.open('README.rst', 'r', encoding="utf-8") as f:
+ with open("README.rst", encoding="utf-8") as f:
return f.read()
-dev_requiremnets = ['pytest', 'hypothesis']
-setup(name='yamlloader',
- version='1.0.0',
- author='Jonas Eschle "Mayou36", Johannes Lade "SebastianJL"',
- author_email='[email protected], [email protected]',
- maintainer='Jonas Eschle "Mayou36"',
- maintainer_email='[email protected]',
- url='https://github.com/Phynix/yamlloader',
- download_url='https://github.com/Phynix/yamlloader',
- license='MIT License',
- description='Ordered YAML loader and dumper for PyYAML.',
- long_description=long_description(),
- keywords=['YAML', 'loader', 'dumper', 'ordered', 'OrderedDict',
'pyyaml'],
- classifiers=['Development Status :: 5 - Production/Stable',
- 'Intended Audience :: Developers',
- 'Intended Audience :: System Administrators',
- 'Intended Audience :: Science/Research',
- 'Natural Language :: English',
- 'License :: OSI Approved :: MIT License', 'Programming
Language :: Python',
- # 'Programming Language :: Python :: 2.7', 'Programming
Language :: Python :: 3',
- # 'Programming Language :: Python :: 3.4',
- # 'Programming Language :: Python :: 3.5',
- 'Programming Language :: Python :: 3.6',
- 'Programming Language :: Python :: 3.7',
- 'Programming Language :: Python :: 3.8',
- 'Programming Language :: Python :: 3.9',
- 'Topic :: Utilities'],
- packages=['yamlloader', 'yamlloader.ordereddict'],
- python_requires=">=3.6",
- install_requires=requirements,
- tests_require=dev_requiremnets,
- extras_require={'dev': dev_requiremnets},
- zip_safe=False
- )
+dev_requiremnets = ["pytest", "hypothesis"]
+setup(
+ name="yamlloader",
+ version="1.1.0",
+ author='Jonas Eschle "Mayou36", Johannes Lade "SebastianJL"',
+ author_email="[email protected], [email protected]",
+ maintainer='Jonas Eschle "Mayou36"',
+ maintainer_email="[email protected]",
+ url="https://github.com/Phynix/yamlloader";,
+ download_url="https://github.com/Phynix/yamlloader";,
+ license="MIT License",
+ description="Ordered YAML loader and dumper for PyYAML.",
+ long_description=long_description(),
+ keywords=["YAML", "loader", "dumper", "ordered", "OrderedDict", "pyyaml"],
+ classifiers=[
+ "Development Status :: 5 - Production/Stable",
+ "Intended Audience :: Developers",
+ "Intended Audience :: System Administrators",
+ "Intended Audience :: Science/Research",
+ "Natural Language :: English",
+ "License :: OSI Approved :: MIT License",
+ "Programming Language :: Python",
+ "Programming Language :: Python :: 3.6",
+ "Programming Language :: Python :: 3.7",
+ "Programming Language :: Python :: 3.8",
+ "Programming Language :: Python :: 3.9",
+ "Topic :: Utilities",
+ ],
+ packages=["yamlloader", "yamlloader.ordereddict"],
+ python_requires=">=3.6",
+ install_requires=requirements,
+ tests_require=dev_requiremnets,
+ extras_require={"dev": dev_requiremnets},
+ zip_safe=False,
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yamlloader-1.0.0/yamlloader/__init__.py
new/yamlloader-1.1.0/yamlloader/__init__.py
--- old/yamlloader-1.0.0/yamlloader/__init__.py 2021-03-03 18:49:25.000000000
+0100
+++ new/yamlloader-1.1.0/yamlloader/__init__.py 2021-07-13 11:21:06.000000000
+0200
@@ -1,22 +1,17 @@
-"""
-Several different loaders and dumpers for YAML under Python are implemented in
the
-respective submodules.
-
-
-"""
-
-from __future__ import print_function, division, absolute_import
+"""Several different loaders and dumpers for YAML under Python are implemented
in the respective submodules."""
import sys
from . import ordereddict
if sys.version_info[:2] < (2, 7):
- raise RuntimeError("You are using Python < 2.7. This is not supported. "
- "Please upgrade your distribution and/or packages.")
+ raise RuntimeError(
+ "You are using Python < 2.7. This is not supported. "
+ "Please upgrade your distribution and/or packages."
+ )
-__version__ = "0.5.5"
+__version__ = "1.1.0"
__author__ = 'Jonas Eschle "Mayou36", Johannes Lade "SebastianJL"'
-__email__ = '[email protected], [email protected]'
+__email__ = "[email protected], [email protected]"
-__all__ = ['ordereddict']
+__all__ = ["ordereddict"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yamlloader-1.0.0/yamlloader/ordereddict/__init__.py
new/yamlloader-1.1.0/yamlloader/ordereddict/__init__.py
--- old/yamlloader-1.0.0/yamlloader/ordereddict/__init__.py 2021-03-03
18:49:25.000000000 +0100
+++ new/yamlloader-1.1.0/yamlloader/ordereddict/__init__.py 2021-07-13
11:21:06.000000000 +0200
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
"""YAML loaders and dumpers for PyYAML allowing to keep keys order."""
-from __future__ import print_function, division, absolute_import
-from .loaders import Loader, SafeLoader, CLoader, CSafeLoader
from .dumpers import Dumper, SafeDumper, CDumper, CSafeDumper
+from .loaders import Loader, SafeLoader, CLoader, CSafeLoader
-__all__ = ['CLoader',
- 'Loader',
- 'CDumper',
- 'Dumper',
- 'CSafeLoader',
- 'SafeLoader',
- 'CSafeDumper',
- 'SafeDumper']
+__all__ = [
+ "CLoader",
+ "Loader",
+ "CDumper",
+ "Dumper",
+ "CSafeLoader",
+ "SafeLoader",
+ "CSafeDumper",
+ "SafeDumper",
+]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yamlloader-1.0.0/yamlloader/ordereddict/dumpers.py
new/yamlloader-1.1.0/yamlloader/ordereddict/dumpers.py
--- old/yamlloader-1.0.0/yamlloader/ordereddict/dumpers.py 2021-03-03
18:49:25.000000000 +0100
+++ new/yamlloader-1.1.0/yamlloader/ordereddict/dumpers.py 2021-07-13
11:21:06.000000000 +0200
@@ -1,12 +1,10 @@
"""Dumpers for `:py:class:~collections.OrderedDict`."""
-from __future__ import print_function, division, absolute_import
+from collections import OrderedDict
import yaml
-from collections import OrderedDict
-
-import yamlloader.settings
+from .. import settings
__all__ = []
@@ -22,18 +20,18 @@
-------
mapping
"""
- return self.represent_mapping('tag:yaml.org,2002:map', data.items())
+ return self.represent_mapping("tag:yaml.org,2002:map", data.items())
-class OrderedDumperMixin(object):
+class OrderedDumperMixin:
def __init__(self, *args, **kwargs):
sub_doc = self.__doc__
if sub_doc is None:
sub_doc = ""
- self.__doc__ = """Dump :py:class:~`collections.OrderedDict` and
:py:class:`dict` (py37+)
+ self.__doc__ = """Dump :py:class:~`collections.OrderedDict` and
:py:class:`dict` (py37+)
to YAML preserving the order."""
self.__doc__ += sub_doc
- super(OrderedDumperMixin, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.add_representer(OrderedDict, type(self).represent_ordereddict)
represent_ordereddict = staticmethod(represent_ordereddict)
@@ -42,7 +40,7 @@
doc_extension_Cversion = """
The C version is preferable over the non-C version as they
- do equivalent things while the C version is faster.
+ do equivalent things while the C version is faster.
"""
@@ -55,16 +53,19 @@
"""
-if not hasattr(yaml, 'CDumper'):
- if yamlloader.settings.ALLOW_NON_C_FALLBACK:
+if not hasattr(yaml, "CDumper"):
+ if settings.ALLOW_NON_C_FALLBACK:
CDumper = Dumper
else:
+
class CDumper(OrderedDumperMixin, yaml.CDumper):
__doc__ = doc_extension_Cversion
-if not hasattr(yaml, 'CSafeDumper'):
- if yamlloader.settings.ALLOW_NON_C_FALLBACK:
+
+if not hasattr(yaml, "CSafeDumper"):
+ if settings.ALLOW_NON_C_FALLBACK:
CSafeDumper = SafeDumper
else:
+
class CSafeDumper(OrderedDumperMixin, yaml.CSafeDumper):
__doc__ = doc_extension_Cversion
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yamlloader-1.0.0/yamlloader/ordereddict/loaders.py
new/yamlloader-1.1.0/yamlloader/ordereddict/loaders.py
--- old/yamlloader-1.0.0/yamlloader/ordereddict/loaders.py 2021-03-03
18:49:25.000000000 +0100
+++ new/yamlloader-1.1.0/yamlloader/ordereddict/loaders.py 2021-07-13
11:21:06.000000000 +0200
@@ -1,12 +1,10 @@
"""Loaders for `:py:class:~collections.OrderedDict`."""
-from __future__ import print_function, division, absolute_import
+from collections import OrderedDict
import yaml
-from collections import OrderedDict
-
-import yamlloader.settings
+from .. import settings
__all__ = []
@@ -22,7 +20,7 @@
if isinstance(node, yaml.MappingNode):
self.flatten_mapping(node)
else:
- msg = 'Expected a mapping node, but found {}'.format(node.id)
+ msg = f"Expected a mapping node, but found {node.id}"
raise yaml.constructor.ConstructError(None, None, msg, node.start_mark)
mapping = OrderedDict()
@@ -32,20 +30,23 @@
try:
hash(key)
except TypeError as err:
- raise yaml.constructor.ConstructError('while constructing a
mapping', node.start_mark,
- 'found unacceptable key
({})'.format(err),
- key_node.start_mark)
+ raise yaml.constructor.ConstructError(
+ "while constructing a mapping",
+ node.start_mark,
+ f"found unacceptable key ({err})",
+ key_node.start_mark,
+ )
value = self.construct_object(value_node, deep=deep)
mapping[key] = value
return mapping
-class OrderedLoaderMixin(object):
+class OrderedLoaderMixin:
def __init__(self, *args, **kwargs):
- super(OrderedLoaderMixin, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
- self.add_constructor('tag:yaml.org,2002:map',
type(self).construct_yaml_map)
- self.add_constructor('tag:yaml.org,2002:omap',
type(self).construct_yaml_map)
+ self.add_constructor("tag:yaml.org,2002:map",
type(self).construct_yaml_map)
+ self.add_constructor("tag:yaml.org,2002:omap",
type(self).construct_yaml_map)
construct_yaml_map = construct_yaml_map
construct_mapping = construct_mapping
@@ -59,7 +60,7 @@
pass
-if not hasattr(yaml, 'CLoader') and yamlloader.settings.ALLOW_NON_C_FALLBACK:
+if not hasattr(yaml, "CLoader") and settings.ALLOW_NON_C_FALLBACK:
yaml.CLoader = yaml.Loader
@@ -67,7 +68,7 @@
pass
-if not hasattr(yaml, 'CSafeLoader') and
yamlloader.settings.ALLOW_NON_C_FALLBACK:
+if not hasattr(yaml, "CSafeLoader") and settings.ALLOW_NON_C_FALLBACK:
yaml.CSafeLoader = yaml.SafeLoader
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yamlloader-1.0.0/yamlloader/settings.py
new/yamlloader-1.1.0/yamlloader/settings.py
--- old/yamlloader-1.0.0/yamlloader/settings.py 2021-03-03 18:49:25.000000000
+0100
+++ new/yamlloader-1.1.0/yamlloader/settings.py 2021-07-13 11:21:06.000000000
+0200
@@ -1,12 +1,3 @@
-"""
-Global settings for the behavior of the module.
-
-
-"""
-
-from __future__ import print_function, division, absolute_import
-
-import sys
+"""Global settings for the behavior of the module."""
ALLOW_NON_C_FALLBACK = True
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yamlloader-1.0.0/yamlloader.egg-info/PKG-INFO
new/yamlloader-1.1.0/yamlloader.egg-info/PKG-INFO
--- old/yamlloader-1.0.0/yamlloader.egg-info/PKG-INFO 2021-03-03
19:07:26.000000000 +0100
+++ new/yamlloader-1.1.0/yamlloader.egg-info/PKG-INFO 2021-07-13
11:21:14.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: yamlloader
-Version: 1.0.0
+Version: 1.1.0
Summary: Ordered YAML loader and dumper for PyYAML.
Home-page: https://github.com/Phynix/yamlloader
Author: Jonas Eschle "Mayou36", Johannes Lade "SebastianJL"
@@ -9,122 +9,6 @@
Maintainer-email: [email protected]
License: MIT License
Download-URL: https://github.com/Phynix/yamlloader
-Description: .. image::
https://travis-ci.org/Phynix/yamlloader.svg?branch=master
- :target: https://travis-ci.org/Phynix/yamlloader
- .. image:: https://img.shields.io/pypi/pyversions/yamlloader.svg
- :target: https://pypi.org/project/yamlloader/
- .. image::
https://landscape.io/github/Phynix/yamlloader/master/landscape.svg?style=flat
- :target: https://landscape.io/github/Phynix/yamlloader/master
- :alt: Code Health
- .. image::
https://coveralls.io/repos/github/Phynix/yamlloader/badge.svg
- :target: https://coveralls.io/github/Phynix/yamlloader
-
- yamlloader
- ==========
-
-
- This module provides loaders and dumpers for PyYAML. Currently, an
OrderedDict loader/dumper is
- implemented, allowing to keep items order
- when loading resp. dumping a file from/to an OrderedDict (Python 3.7:
Also regular dicts are supported and are the default items to be loaded to. As
of Python 3.7 preservation of insertion order is a language feature of regular
dicts.)
-
- This project was originally mirrored from
- `yamlordereddict
<https://github.com/fmenabe/python-yamlordereddictloader>`_
- Many thanks to the original author Fran??ois M??nab??!
- The library contains several improvements including automated testing
and
- the much faster C-versions of the Loaders/Dumpers.
-
-
- `API Documentation <https://phynix.github.io/yamlloader/index.html>`_
-
-
- Install
- -------
- There is a pip and a conda version available
-
- .. code-block:: bash
-
- $ pip install yamlloader
-
- or
-
- .. code-block:: bash
-
- $ conda install yamlloader -c phynix # it is also in conda-forge
-
-
- But does [your special case here] also work?
- --------------------------------------------
-
- Tests are run continuously using randomly generated yaml files.
- Also, there are no fails to be expected.
-
- Still, if you are concerned that *your* special case may breaks in the
future, please
- add your own tests as `test_ext_anyname.py` under `tests/` or let us
know about your needs.
- This guarantees that no code will be added that breaks *your* case.
-
-
- C vs non-C version
- ------------------
-
- A significant speedup can be reached by replacing the Loader* and
Dumper* classes by CLoader*
- and CDumper*. The package hereby relies on the implementations from
PyYAML. If they have not
- been compiled, *yamlloader* **automatically** falls back to the non-C
versions.
-
- Therefore using the C-version is safe: if it is not available, the
pure Python version is
- automatically used.
-
- Usage examples
- ==============
-
-
- Loader usage
- ------------
-
- .. code-block:: python
-
- import yaml
- import yamlloader
-
- with open('myfile.yml') as yaml_file:
- data = yaml.load(yaml_file,
- Loader=yamlloader.ordereddict.CLoader)
- # CLoader is faster than Loader
-
- **Note:** For using the safe loader (which takes standard YAML tags
and does
- not construct arbitrary Python objects), replace
``yamlloader.ordereddict.CLoader`` by
- ``yamlloader.ordereddict.CSafeLoader``.
-
- Dumper usage
- ------------
-
- .. code-block:: python
-
- import yaml
- import yamlloader
- from collections import OrderedDict
-
- data = OrderedDict([('key1', 'val1'),
- ('key2', OrderedDict([('key21', 'val21'),
- ('key22', 'val22')]))])
-
- with open('myfile.yaml', 'w') as yaml_file:
- yaml.dump(data, yaml_file,
- Dumper=yamlloader.ordereddict.CDumper)
-
- **Note:** For using the safe dumper (which produce standard YAML tags
and does
- not represent arbitrary Python objects), replace
``yamlloader.ordereddict.CDumper`` by
- ``yamlloader.ordereddict.CSafeDumper``.
-
-
- FAQ
- ===
-
- The C version does not work
- ---------------------------
- Check if yaml.cyaml exists. If not, the cyaml module was not compiled
during the installation of
- yaml (pyyaml). Make sure that cython is installed (`pip install
Cython`) and the yaml.h file is
- there (apt: libyaml-dev).
-
Keywords: YAML,loader,dumper,ordered,OrderedDict,pyyaml
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -141,3 +25,123 @@
Classifier: Topic :: Utilities
Requires-Python: >=3.6
Provides-Extra: dev
+License-File: LICENSE
+
+.. image:: https://travis-ci.org/Phynix/yamlloader.svg?branch=master
+ :target: https://travis-ci.org/Phynix/yamlloader
+.. image:: https://img.shields.io/pypi/pyversions/yamlloader.svg
+ :target: https://pypi.org/project/yamlloader/
+.. image::
https://landscape.io/github/Phynix/yamlloader/master/landscape.svg?style=flat
+ :target: https://landscape.io/github/Phynix/yamlloader/master
+ :alt: Code Health
+.. image:: https://coveralls.io/repos/github/Phynix/yamlloader/badge.svg
+ :target: https://coveralls.io/github/Phynix/yamlloader
+
+yamlloader
+==========
+
+
+This module provides loaders and dumpers for PyYAML. Currently, an OrderedDict
loader/dumper is
+implemented, allowing to keep items order
+when loading resp. dumping a file from/to an OrderedDict (Python 3.7+: Also
regular dicts are supported and are the default items to be loaded to. As of
Python 3.7 preservation of insertion order is a language feature of regular
dicts.)
+
+This project was originally mirrored from
+`yamlordereddict <https://github.com/fmenabe/python-yamlordereddictloader>`_
+Many thanks to the original author Fran??ois M??nab??!
+The library contains several improvements including automated testing and
+the much faster C-versions of the Loaders/Dumpers.
+
+
+`API Documentation <https://yamlloader.readthedocs.io/>`_
+
+
+Install
+-------
+There is a pip and a conda version available
+
+.. code-block:: bash
+
+ $ pip install yamlloader
+
+or
+
+.. code-block:: bash
+
+ $ conda install yamlloader -c conda-forge
+
+
+But does [your special case here] also work?
+--------------------------------------------
+
+Tests are run continuously using randomly generated yaml files.
+Also, there are no fails to be expected.
+
+Still, if you are concerned that *your* special case may breaks in the future,
please
+add your own tests as `test_ext_anyname.py` under `tests/` or let us know
about your needs.
+This guarantees that no code will be added that breaks *your* case.
+
+
+C vs non-C version
+------------------
+
+A significant speedup can be reached by replacing the Loader* and Dumper*
classes by CLoader*
+and CDumper*. The package hereby relies on the implementations from PyYAML. If
they have not
+been compiled, *yamlloader* **automatically** falls back to the non-C versions.
+
+Therefore using the C-version is safe: if it is not available, the pure Python
version is
+automatically used.
+
+Usage examples
+==============
+
+
+Loader usage
+------------
+
+.. code-block:: python
+
+ import yaml
+ import yamlloader
+
+ with open('myfile.yml') as yaml_file:
+ data = yaml.load(yaml_file,
+ Loader=yamlloader.ordereddict.CLoader)
+ # CLoader is faster than Loader
+
+**Note:** For using the safe loader (which takes standard YAML tags and does
+not construct arbitrary Python objects), replace
``yamlloader.ordereddict.CLoader`` by
+``yamlloader.ordereddict.CSafeLoader``.
+
+Dumper usage
+------------
+
+.. code-block:: python
+
+ import yaml
+ import yamlloader
+ from collections import OrderedDict
+
+ data = OrderedDict([('key1', 'val1'),
+ ('key2', OrderedDict([('key21', 'val21'),
+ ('key22', 'val22')]))])
+
+ with open('myfile.yaml', 'w') as yaml_file:
+ yaml.dump(data, yaml_file,
+ Dumper=yamlloader.ordereddict.CDumper)
+
+**Note:** For using the safe dumper (which produce standard YAML tags and does
+not represent arbitrary Python objects), replace
``yamlloader.ordereddict.CDumper`` by
+``yamlloader.ordereddict.CSafeDumper``.
+
+
+FAQ
+===
+
+C version not working
+---------------------------
+If the C version is not working (it falls back by default to a non-C version),
+check if yaml.cyaml exists. If not, the cyaml module was not compiled during
the installation of
+yaml (pyyaml). Make sure that cython is installed (`pip install Cython`) and
the yaml.h file is
+there (apt: libyaml-dev).
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yamlloader-1.0.0/yamlloader.egg-info/SOURCES.txt
new/yamlloader-1.1.0/yamlloader.egg-info/SOURCES.txt
--- old/yamlloader-1.0.0/yamlloader.egg-info/SOURCES.txt 2021-03-03
19:07:26.000000000 +0100
+++ new/yamlloader-1.1.0/yamlloader.egg-info/SOURCES.txt 2021-07-13
11:21:14.000000000 +0200
@@ -1,6 +1,7 @@
LICENSE
MANIFEST.in
README.rst
+pyproject.toml
requirements.txt
setup.py
yamlloader/__init__.py
