commit python-natsort for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/128a7b98d536a9cf9b4d4d5a90d63475.jpg?s=120&d=mm&r=g)
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-natsort for openSUSE:Factory checked in at 2021-02-02 14:25:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-natsort (Old) and /work/SRC/openSUSE:Factory/.python-natsort.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-natsort" Tue Feb 2 14:25:35 2021 rev:18 rq:868437 version:7.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-natsort/python-natsort.changes 2021-01-20 18:27:46.855537339 +0100 +++ /work/SRC/openSUSE:Factory/.python-natsort.new.28504/python-natsort.changes 2021-02-02 14:25:53.723412690 +0100 @@ -1,0 +2,8 @@ +Mon Feb 1 18:02:55 UTC 2021 - Dirk M��ller <dmueller@suse.com> + +- update to 7.1.1: + - Use GitHub Actions instead of Travis-CI (issue #125) + - No longer pin testing dependencies (issue #126) + - Correct a minor typo + +------------------------------------------------------------------- Old: ---- natsort-7.1.0.tar.gz New: ---- natsort-7.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-natsort.spec ++++++ --- /var/tmp/diff_new_pack.EAJvYP/_old 2021-02-02 14:25:54.467413848 +0100 +++ /var/tmp/diff_new_pack.EAJvYP/_new 2021-02-02 14:25:54.475413860 +0100 @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-natsort -Version: 7.1.0 +Version: 7.1.1 Release: 0 Summary: Natural sorting in Python License: MIT ++++++ natsort-7.1.0.tar.gz -> natsort-7.1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/CHANGELOG.md new/natsort-7.1.1/CHANGELOG.md --- old/natsort-7.1.0/CHANGELOG.md 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/CHANGELOG.md 2021-01-25 06:20:07.000000000 +0100 @@ -1,6 +1,16 @@ Unreleased --- +[7.1.1] - 2021-01-24 +--- + +### Changed + - Use GitHub Actions instead of Travis-CI (issue #125) + - No longer pin testing dependencies (issue #126) + +### Fixed + - Correct a minor typo ([@madphysicist](https://github.com/madphysicist), issue #127) + [7.1.0] - 2020-11-19 --- @@ -550,6 +560,7 @@ - Sorting algorithm to support floats (including exponentials) and basic version number support <!---Comparison links--> +[7.1.1]: https://github.com/SethMMorton/natsort/compare/7.1.0...7.1.1 [7.1.0]: https://github.com/SethMMorton/natsort/compare/7.0.1...7.1.0 [7.0.1]: https://github.com/SethMMorton/natsort/compare/7.0.0...7.0.1 [7.0.0]: https://github.com/SethMMorton/natsort/compare/6.2.0...7.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/PKG-INFO new/natsort-7.1.1/PKG-INFO --- old/natsort-7.1.0/PKG-INFO 2020-11-21 02:39:03.000000000 +0100 +++ new/natsort-7.1.1/PKG-INFO 2021-01-25 06:20:09.147655500 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: natsort -Version: 7.1.0 +Version: 7.1.1 Summary: Simple yet flexible natural sorting in Python. Home-page: https://github.com/SethMMorton/natsort Author: Seth M. Morton @@ -18,15 +18,12 @@ .. image:: https://img.shields.io/pypi/l/natsort.svg :target: https://github.com/SethMMorton/natsort/blob/master/LICENSE - .. image:: https://img.shields.io/travis/SethMMorton/natsort/master.svg?label=travis-ci - :target: https://travis-ci.com/SethMMorton/natsort + .. image:: https://github.com/SethMMorton/natsort/workflows/Tests/badge.svg + :target: https://github.com/SethMMorton/natsort/actions .. image:: https://codecov.io/gh/SethMMorton/natsort/branch/master/graph/badge.svg :target: https://codecov.io/gh/SethMMorton/natsort - .. image:: https://api.codacy.com/project/badge/Grade/f2bf04b1fc5d4792bf546f6e497cf4b8 - :target: https://www.codacy.com/app/SethMMorton/natsort - Simple yet flexible natural sorting in Python. - Source Code: https://github.com/SethMMorton/natsort @@ -554,5 +551,5 @@ Classifier: Topic :: Text Processing Requires-Python: >=3.4 Description-Content-Type: text/x-rst -Provides-Extra: icu Provides-Extra: fast +Provides-Extra: icu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/README.rst new/natsort-7.1.1/README.rst --- old/natsort-7.1.0/README.rst 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/README.rst 2021-01-25 06:20:07.000000000 +0100 @@ -10,15 +10,12 @@ .. image:: https://img.shields.io/pypi/l/natsort.svg :target: https://github.com/SethMMorton/natsort/blob/master/LICENSE -.. image:: https://img.shields.io/travis/SethMMorton/natsort/master.svg?label=travis-ci - :target: https://travis-ci.com/SethMMorton/natsort +.. image:: https://github.com/SethMMorton/natsort/workflows/Tests/badge.svg + :target: https://github.com/SethMMorton/natsort/actions .. image:: https://codecov.io/gh/SethMMorton/natsort/branch/master/graph/badge.svg :target: https://codecov.io/gh/SethMMorton/natsort -.. image:: https://api.codacy.com/project/badge/Grade/f2bf04b1fc5d4792bf546f6e497cf4b8 - :target: https://www.codacy.com/app/SethMMorton/natsort - Simple yet flexible natural sorting in Python. - Source Code: https://github.com/SethMMorton/natsort diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/dev/README.md new/natsort-7.1.1/dev/README.md --- old/natsort-7.1.0/dev/README.md 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/dev/README.md 2021-01-25 06:20:07.000000000 +0100 @@ -9,5 +9,5 @@ - `clean.py` - This file cleans most files that are created during development. Run in the project home directory. It is not really intended to be called directly, but instead through `tox -e clean`. -- `requirements.in` - Our direct requirements to run tests. -- `requirements.txt` - All pinned requirements to run tests. +- `generate_new_unicode_numbers.py` is used to update `natsort/unicode_numeric_hex.py` + when new Python versions are released. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/dev/bump.py new/natsort-7.1.1/dev/bump.py --- old/natsort-7.1.0/dev/bump.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/dev/bump.py 2021-01-25 06:20:07.000000000 +0100 @@ -33,7 +33,9 @@ cmd = ["bump2version", *args, severity] try: if catch: - return subprocess.run(cmd, check=True, capture_output=True, text=True).stdout + return subprocess.run( + cmd, check=True, capture_output=True, text=True + ).stdout else: subprocess.run(cmd, check=True, text=True) except subprocess.CalledProcessError as e: @@ -57,8 +59,8 @@ "<!---Comparison links-->\n[{new}]: {url}/{current}...{new}".format( new=data["new_version"], current=data["current_version"], - url="https://github.com/SethMMorton/natsort/compare" - ) + url="https://github.com/SethMMorton/natsort/compare", + ), ) with open("CHANGELOG.md", "w") as fl: fl.write(changelog) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/dev/requirements.in new/natsort-7.1.1/dev/requirements.in --- old/natsort-7.1.0/dev/requirements.in 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/dev/requirements.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -coverage -pytest -pytest-cov -pytest-mock -hypothesis -# pytest-faulthandler; platform_python_implementation == 'CPython' -semver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/dev/requirements.txt new/natsort-7.1.1/dev/requirements.txt --- old/natsort-7.1.0/dev/requirements.txt 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/dev/requirements.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# -# This file is autogenerated by pip-compile -# To update, run: -# -# pip-compile requirements.in -# -attrs==19.3.0 # via hypothesis, pytest -coverage==5.0.2 -hypothesis==5.1.1 -importlib-metadata==1.3.0 # via pluggy, pytest -more-itertools==8.0.2 # via pytest, zipp -packaging==20.0 # via pytest -pluggy==0.13.1 # via pytest -py==1.8.1 # via pytest -pyparsing==2.4.6 # via packaging -pytest-cov==2.8.1 -pytest-mock==2.0.0 -pytest==5.3.2 -semver==2.9.0 -six==1.13.0 # via packaging -sortedcontainers==2.1.0 # via hypothesis -wcwidth==0.1.8 # via pytest -zipp==0.6.0 # via importlib-metadata diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/docs/conf.py new/natsort-7.1.1/docs/conf.py --- old/natsort-7.1.0/docs/conf.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/docs/conf.py 2021-01-25 06:20:07.000000000 +0100 @@ -28,39 +28,39 @@ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ - 'sphinx.ext.autodoc', - 'sphinx.ext.autosummary', - 'sphinx.ext.intersphinx', - 'sphinx.ext.mathjax', - 'sphinx.ext.napoleon', - 'm2r', + "sphinx.ext.autodoc", + "sphinx.ext.autosummary", + "sphinx.ext.intersphinx", + "sphinx.ext.mathjax", + "sphinx.ext.napoleon", + "m2r2", ] # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = ["_templates"] # The suffix of source filenames. -source_suffix = ['.rst', '.md'] +source_suffix = [".rst", ".md"] # The encoding of source files. # source_encoding = 'utf-8-sig' # The master toctree document. -master_doc = 'index' +master_doc = "index" # General information about the project. -project = 'natsort' +project = "natsort" # noinspection PyShadowingBuiltins -copyright = '2014, Seth M. Morton' +copyright = "2014, Seth M. Morton" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The full version, including alpha/beta/rc tags. -release = '7.1.0' +release = "7.1.1" # The short X.Y version. -version = '.'.join(release.split('.')[0:2]) +version = ".".join(release.split(".")[0:2]) # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -92,8 +92,8 @@ # show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' -highlight_language = 'python' +pygments_style = "sphinx" +highlight_language = "python" # A list of ignored prefixes for module index sorting. # modindex_common_prefix = [] @@ -106,13 +106,13 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -on_rtd = os.environ.get('READTHEDOCS') == 'True' +on_rtd = os.environ.get("READTHEDOCS") == "True" if on_rtd: - html_theme = 'default' + html_theme = "default" else: import sphinx_rtd_theme # noqa: F401 - html_theme = 'sphinx_rtd_theme' + html_theme = "sphinx_rtd_theme" # html_theme = 'solar' # Theme options are theme-specific and customize the look and feel of a theme @@ -121,7 +121,7 @@ # html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -html_theme_path = ['.'] +html_theme_path = ["."] # The name for this set of Sphinx documents. If None, it defaults to # "<project> v<release> documentation". @@ -191,17 +191,15 @@ # html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'natsortdoc' +htmlhelp_basename = "natsortdoc" # -- Options for LaTeX output --------------------------------------------- latex_elements = { # The paper size ('letterpaper' or 'a4paper'). # 'papersize': 'letterpaper', - # The font size ('10pt', '11pt' or '12pt'). # 'pointsize': '10pt', - # Additional stuff for the LaTeX preamble. # 'preamble': '', } @@ -210,8 +208,7 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index', 'natsort.tex', 'natsort Documentation', - 'Seth M. Morton', 'manual'), + ("index", "natsort.tex", "natsort Documentation", "Seth M. Morton", "manual"), ] # The name of an image file (relative to this directory) to place at the top of @@ -239,10 +236,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'natsort', 'natsort Documentation', - ['Seth M. Morton'], 1) -] +man_pages = [("index", "natsort", "natsort Documentation", ["Seth M. Morton"], 1)] # If true, show URL addresses after external links. # man_show_urls = False @@ -254,9 +248,15 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'natsort', 'natsort Documentation', - 'Seth M. Morton', 'natsort', 'One line description of project.', - 'Miscellaneous'), + ( + "index", + "natsort", + "natsort Documentation", + "Seth M. Morton", + "natsort", + "One line description of project.", + "Miscellaneous", + ), ] # Documents to append as an appendix to all manuals. @@ -273,4 +273,4 @@ # Example configuration for intersphinx: refer to the Python standard library. -intersphinx_mapping = {'python': ('https://docs.python.org/3', None)} +intersphinx_mapping = {"python": ("https://docs.python.org/3", None)} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/docs/examples.rst new/natsort-7.1.1/docs/examples.rst --- old/natsort-7.1.0/docs/examples.rst 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/docs/examples.rst 2021-01-25 06:20:07.000000000 +0100 @@ -81,9 +81,9 @@ .. code-block:: pycon - >>> from semver import parse_version_info + >>> from semver import VersionInfo >>> a = ['3.4.5-pre.1', '3.4.5', '3.4.5-pre.2+build.4'] - >>> sorted(a, key=parse_version_info) + >>> sorted(a, key=VersionInfo.parse) ['3.4.5-pre.1', '3.4.5-pre.2+build.4', '3.4.5'] .. _path_sort: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/docs/locale_issues.rst new/natsort-7.1.1/docs/locale_issues.rst --- old/natsort-7.1.0/docs/locale_issues.rst 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/docs/locale_issues.rst 2021-01-25 06:20:07.000000000 +0100 @@ -23,7 +23,7 @@ When :func:`~natsort.natsort_keygen` is called it returns a key function that hard-codes the provided settings. This means that the key returned when -``ns.LOCALE`` is used contins the settings specifed by the locale +``ns.LOCALE`` is used contains the settings specifed by the locale *loaded at the time the key is generated*. If you change the locale, you should regenerate the key to account for the new locale. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/docs/requirements.in new/natsort-7.1.1/docs/requirements.in --- old/natsort-7.1.0/docs/requirements.in 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/docs/requirements.in 2021-01-25 06:20:07.000000000 +0100 @@ -1 +1 @@ -m2r @ git+https://github.com/crossnox/m2r@dev#egg=m2r +m2r2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/docs/requirements.txt new/natsort-7.1.1/docs/requirements.txt --- old/natsort-7.1.0/docs/requirements.txt 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/docs/requirements.txt 2021-01-25 06:20:07.000000000 +0100 @@ -4,6 +4,6 @@ # # pip-compile # -docutils==0.16 # via m2r -git+https://github.com/crossnox/m2r@dev#egg=m2r # via -r requirements.in -mistune==0.8.4 # via m2r +docutils==0.16 # via m2r2 +m2r2==0.2.7 # via -r requirements.in +mistune==0.8.4 # via m2r2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/natsort/__init__.py new/natsort-7.1.1/natsort/__init__.py --- old/natsort-7.1.0/natsort/__init__.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/natsort/__init__.py 2021-01-25 06:20:07.000000000 +0100 @@ -21,7 +21,7 @@ ) from natsort.utils import chain_functions -__version__ = "7.1.0" +__version__ = "7.1.1" __all__ = [ "natsort_key", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/natsort/compat/fake_fastnumbers.py new/natsort-7.1.1/natsort/compat/fake_fastnumbers.py --- old/natsort-7.1.0/natsort/compat/fake_fastnumbers.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/natsort/compat/fake_fastnumbers.py 2021-01-25 06:20:07.000000000 +0100 @@ -81,10 +81,7 @@ # noinspection PyIncorrectDocstring def fast_int( - x, - key=lambda x: x, - _uni=unicodedata.digit, - _first_char=POTENTIAL_FIRST_CHAR, + x, key=lambda x: x, _uni=unicodedata.digit, _first_char=POTENTIAL_FIRST_CHAR ): """ Convert a string to a int quickly, return input as-is if not possible. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/natsort/natsort.py new/natsort-7.1.1/natsort/natsort.py --- old/natsort-7.1.0/natsort/natsort.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/natsort/natsort.py 2021-01-25 06:20:07.000000000 +0100 @@ -646,9 +646,7 @@ except ImportError: # No ICU installed def os_sort_keygen(key=None): - return natsort_keygen( - key=key, alg=ns.LOCALE | ns.PATH | ns.IGNORECASE - ) + return natsort_keygen(key=key, alg=ns.LOCALE | ns.PATH | ns.IGNORECASE) else: # ICU installed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/natsort/ns_enum.py new/natsort-7.1.1/natsort/ns_enum.py --- old/natsort-7.1.0/natsort/ns_enum.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/natsort/ns_enum.py 2021-01-25 06:20:07.000000000 +0100 @@ -65,9 +65,7 @@ combined_value |= enum_fields[combo_name] enum_fields[name] = combined_value -enum_fields.update( - (alias, enum_fields[name]) for alias, name in enum_aliases -) +enum_fields.update((alias, enum_fields[name]) for alias, name in enum_aliases) # Subclass the namedtuple to improve the docstring. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/natsort.egg-info/PKG-INFO new/natsort-7.1.1/natsort.egg-info/PKG-INFO --- old/natsort-7.1.0/natsort.egg-info/PKG-INFO 2020-11-21 02:39:03.000000000 +0100 +++ new/natsort-7.1.1/natsort.egg-info/PKG-INFO 2021-01-25 06:20:09.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: natsort -Version: 7.1.0 +Version: 7.1.1 Summary: Simple yet flexible natural sorting in Python. Home-page: https://github.com/SethMMorton/natsort Author: Seth M. Morton @@ -18,15 +18,12 @@ .. image:: https://img.shields.io/pypi/l/natsort.svg :target: https://github.com/SethMMorton/natsort/blob/master/LICENSE - .. image:: https://img.shields.io/travis/SethMMorton/natsort/master.svg?label=travis-ci - :target: https://travis-ci.com/SethMMorton/natsort + .. image:: https://github.com/SethMMorton/natsort/workflows/Tests/badge.svg + :target: https://github.com/SethMMorton/natsort/actions .. image:: https://codecov.io/gh/SethMMorton/natsort/branch/master/graph/badge.svg :target: https://codecov.io/gh/SethMMorton/natsort - .. image:: https://api.codacy.com/project/badge/Grade/f2bf04b1fc5d4792bf546f6e497cf4b8 - :target: https://www.codacy.com/app/SethMMorton/natsort - Simple yet flexible natural sorting in Python. - Source Code: https://github.com/SethMMorton/natsort @@ -554,5 +551,5 @@ Classifier: Topic :: Text Processing Requires-Python: >=3.4 Description-Content-Type: text/x-rst -Provides-Extra: icu Provides-Extra: fast +Provides-Extra: icu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/natsort.egg-info/SOURCES.txt new/natsort-7.1.1/natsort.egg-info/SOURCES.txt --- old/natsort-7.1.0/natsort.egg-info/SOURCES.txt 2020-11-21 02:39:03.000000000 +0100 +++ new/natsort-7.1.1/natsort.egg-info/SOURCES.txt 2021-01-25 06:20:09.000000000 +0100 @@ -10,8 +10,6 @@ dev/bump.py dev/clean.py dev/generate_new_unicode_numbers.py -dev/requirements.in -dev/requirements.txt docs/api.rst docs/changelog.rst docs/conf.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/setup.cfg new/natsort-7.1.1/setup.cfg --- old/natsort-7.1.0/setup.cfg 2020-11-21 02:39:03.000000000 +0100 +++ new/natsort-7.1.1/setup.cfg 2021-01-25 06:20:09.151655400 +0100 @@ -1,5 +1,5 @@ [bumpversion] -current_version = 7.1.0 +current_version = 7.1.1 commit = True tag = True tag_name = {new_version} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/setup.py new/natsort-7.1.1/setup.py --- old/natsort-7.1.0/setup.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/setup.py 2021-01-25 06:20:07.000000000 +0100 @@ -1,14 +1,12 @@ #! /usr/bin/env python from setuptools import find_packages, setup + setup( - name='natsort', - version='7.1.0', + name="natsort", + version="7.1.1", packages=find_packages(), - entry_points={'console_scripts': ['natsort = natsort.__main__:main']}, + entry_points={"console_scripts": ["natsort = natsort.__main__:main"]}, python_requires=">=3.4", - extras_require={ - 'fast': ["fastnumbers >= 2.0.0"], - 'icu': ["PyICU >= 1.0.0"] - } + extras_require={"fast": ["fastnumbers >= 2.0.0"], "icu": ["PyICU >= 1.0.0"]}, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/tests/conftest.py new/natsort-7.1.1/tests/conftest.py --- old/natsort-7.1.0/tests/conftest.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/tests/conftest.py 2021-01-25 06:20:07.000000000 +0100 @@ -12,8 +12,7 @@ # For some reason it thinks that the text/binary generation is too # slow then causes the tests to fail. hypothesis.settings.register_profile( - "slow-tests", - suppress_health_check=[hypothesis.HealthCheck.too_slow], + "slow-tests", suppress_health_check=[hypothesis.HealthCheck.too_slow] ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/tests/test_final_data_transform_factory.py new/natsort-7.1.1/tests/test_final_data_transform_factory.py --- old/natsort-7.1.0/tests/test_final_data_transform_factory.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/tests/test_final_data_transform_factory.py 2021-01-25 06:20:07.000000000 +0100 @@ -26,8 +26,8 @@ (ns.LOCALE | ns.UNGROUPLETTERS | NS_DUMB, lambda x: x), (ns.LOCALE | ns.UNGROUPLETTERS | ns.LOWERCASEFIRST, lambda x: x), ( - ns.LOCALE | ns.UNGROUPLETTERS | NS_DUMB | ns.LOWERCASEFIRST, - lambda x: x.swapcase(), + ns.LOCALE | ns.UNGROUPLETTERS | NS_DUMB | ns.LOWERCASEFIRST, + lambda x: x.swapcase(), ), ], ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/tests/test_main.py new/natsort-7.1.1/tests/test_main.py --- old/natsort-7.1.0/tests/test_main.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/tests/test_main.py 2021-01-25 06:20:07.000000000 +0100 @@ -151,11 +151,11 @@ assert range_check(6.4, 30) == (6.4, 30.0) -@given(x=floats(allow_nan=False, min_value=-1E8, max_value=1E8) | integers(), d=data()) +@given(x=floats(allow_nan=False, min_value=-1e8, max_value=1e8) | integers(), d=data()) def test_range_check_returns_range_as_is_if_first_is_less_than_second(x, d): # Pull data such that the first is less than the second. if isinstance(x, float): - y = d.draw(floats(min_value=x + 1.0, max_value=1E9, allow_nan=False)) + y = d.draw(floats(min_value=x + 1.0, max_value=1e9, allow_nan=False)) else: y = d.draw(integers(min_value=x + 1)) assert range_check(x, y) == (x, y) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/tests/test_natsorted.py new/natsort-7.1.1/tests/test_natsorted.py --- old/natsort-7.1.0/tests/test_natsorted.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/tests/test_natsorted.py 2021-01-25 06:20:07.000000000 +0100 @@ -88,12 +88,12 @@ @pytest.mark.parametrize( "alg, expected, slc", [ - (ns.DEFAULT, [float("nan"), 5, "25", 1E40], slice(1, None)), - (ns.NANLAST, [5, "25", 1E40, float("nan")], slice(None, 3)), + (ns.DEFAULT, [float("nan"), 5, "25", 1e40], slice(1, None)), + (ns.NANLAST, [5, "25", 1e40, float("nan")], slice(None, 3)), ], ) def test_natsorted_handles_nan(alg, expected, slc): - given = ["25", 5, float("nan"), 1E40] + given = ["25", 5, float("nan"), 1e40] # The slice is because NaN != NaN # noinspection PyUnresolvedReferences assert natsorted(given, alg=alg)[slc] == expected[slc] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/tests/test_natsorted_convenience.py new/natsort-7.1.1/tests/test_natsorted_convenience.py --- old/natsort-7.1.0/tests/test_natsorted_convenience.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/tests/test_natsorted_convenience.py 2021-01-25 06:20:07.000000000 +0100 @@ -43,9 +43,7 @@ int_obj = 14 assert func(b"bytes") == str_obj assert func(int_obj) is int_obj # returns as-is, same object ID - assert ( - func(str_obj) is str_obj - ) # same object returned b/c only bytes has decode + assert func(str_obj) is str_obj # same object returned b/c only bytes has decode def test_as_ascii_converts_bytes_to_ascii(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/tests/test_parse_string_function.py new/natsort-7.1.1/tests/test_parse_string_function.py --- old/natsort-7.1.0/tests/test_parse_string_function.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/tests/test_parse_string_function.py 2021-01-25 06:20:07.000000000 +0100 @@ -33,12 +33,11 @@ return t -@pytest.fixture -def parse_string_func(request): +def parse_string_func_factory(alg): """A parse_string_factory result with sample arguments.""" sep = "" return parse_string_factory( - request.param, # algorirhm + alg, sep, NumRegex.int_nosign().split, input_transform, @@ -47,22 +46,21 @@ ) -@pytest.mark.parametrize("parse_string_func", [ns.DEFAULT], indirect=True) @given(x=floats() | integers()) -def test_parse_string_factory_raises_type_error_if_given_number(x, parse_string_func): +def test_parse_string_factory_raises_type_error_if_given_number(x): + parse_string_func = parse_string_func_factory(ns.DEFAULT) with pytest.raises(TypeError): assert parse_string_func(x) # noinspection PyCallingNonCallable @pytest.mark.parametrize( - "parse_string_func, orig_func", + "alg, orig_func", [ (ns.DEFAULT, lambda x: x.upper()), (ns.LOCALE, lambda x: x.upper()), (ns.LOCALE | NS_DUMB, lambda x: x), # This changes the "original" handling. ], - indirect=["parse_string_func"], ) @given( x=lists( @@ -70,7 +68,8 @@ ) ) @pytest.mark.usefixtures("with_locale_en_us") -def test_parse_string_factory_invariance(x, parse_string_func, orig_func): +def test_parse_string_factory_invariance(x, alg, orig_func): + parse_string_func = parse_string_func_factory(alg) # parse_string_factory is the high-level combination of several dedicated # functions involved in splitting and manipulating a string. The details of # what those functions do is not relevant to testing parse_string_factory. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/tests/test_regex.py new/natsort-7.1.1/tests/test_regex.py --- old/natsort-7.1.0/tests/test_regex.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/tests/test_regex.py 2021-01-25 06:20:07.000000000 +0100 @@ -81,7 +81,7 @@ f_s: ["", "12", "", "���", "", "���", "", "���", "", "���", "", "���", ""], f_ue: ["", "12", "", "���", "", "���", "", "���", "", "���", "", "���", ""], f_se: ["", "12", "", "���", "", "���", "", "���", "", "���", "", "���", ""], - } + }, } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/tests/test_string_component_transform_factory.py new/natsort-7.1.1/tests/test_string_component_transform_factory.py --- old/natsort-7.1.0/tests/test_string_component_transform_factory.py 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/tests/test_string_component_transform_factory.py 2021-01-25 06:20:07.000000000 +0100 @@ -15,9 +15,7 @@ # library on BSD systems that has nothing to do with natsort (a ValueError is # raised by strxfrm). Let's filter them out. try: - bad_uni_chars = frozenset( - chr(x) for x in range(0X10fefd, 0X10ffff + 1) - ) + bad_uni_chars = frozenset(chr(x) for x in range(0x10FEFD, 0x10FFFF + 1)) except ValueError: # Narrow unicode build... no worries. bad_uni_chars = frozenset() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/natsort-7.1.0/tox.ini new/natsort-7.1.1/tox.ini --- old/natsort-7.1.0/tox.ini 2020-11-21 02:38:43.000000000 +0100 +++ new/natsort-7.1.1/tox.ini 2021-01-25 06:20:07.000000000 +0100 @@ -20,7 +20,12 @@ passenv = WITH_EXTRAS deps = - -r dev/requirements.txt + coverage + pytest + pytest-cov + pytest-mock + hypothesis + semver extras = {env:WITH_EXTRAS:} commands = @@ -52,7 +57,7 @@ # will already be installed on readthedocs. [testenv:docs] deps = - sphinx < 3.3.0 + sphinx sphinx_rtd_theme -r docs/requirements.txt commands = @@ -83,3 +88,12 @@ deps = commands = {envpython} dev/clean.py skip_install = true + +# Get GitHub actions to run the correct tox environment +[gh-actions] +python = + 3.5: py35 + 3.6: py36 + 3.7: py37 + 3.8: py38 + 3.9: py39
participants (1)
-
Source-Sync