Hello community, here is the log from the commit of package python-astropy-helpers for openSUSE:Factory checked in at 2020-02-03 11:12:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-astropy-helpers (Old) and /work/SRC/openSUSE:Factory/.python-astropy-helpers.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-astropy-helpers" Mon Feb 3 11:12:38 2020 rev:7 rq:768775 version:4.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-astropy-helpers/python-astropy-helpers.changes 2019-11-21 12:59:22.542514782 +0100 +++ /work/SRC/openSUSE:Factory/.python-astropy-helpers.new.26092/python-astropy-helpers.changes 2020-02-03 11:12:51.705831087 +0100 @@ -1,0 +2,11 @@ +Thu Jan 30 14:38:16 UTC 2020 - Todd R <toddrme2...@gmail.com> + +- Update to 4.0.1 + * Fix pip installation. +- Update to 4.0 + * Changed minimum required Python version to 3.6. + * Changed minimum required Sphinx version to 1.7. + * Added a --parallel option for build_docs. + * Fix compatibility with setuptools 42.x. + +------------------------------------------------------------------- Old: ---- astropy-helpers-3.2.2.tar.gz New: ---- astropy-helpers-4.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-astropy-helpers.spec ++++++ --- /var/tmp/diff_new_pack.p3Mddn/_old 2020-02-03 11:12:53.257831871 +0100 +++ /var/tmp/diff_new_pack.p3Mddn/_new 2020-02-03 11:12:53.261831873 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-astropy-helpers # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-astropy-helpers -Version: 3.2.2 +Version: 4.0.1 Release: 0 Summary: Utilities for building and installing Astropy License: BSD-3-Clause @@ -27,13 +27,13 @@ Source: https://files.pythonhosted.org/packages/source/a/astropy-helpers/astropy-helpers-%{version}.tar.gz Source100: python-astropy-helpers-rpmlintrc BuildRequires: %{python_module Cython} -BuildRequires: %{python_module Sphinx} +BuildRequires: %{python_module Sphinx >= 1.7} BuildRequires: %{python_module numpydoc} BuildRequires: %{python_module numpy} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-Sphinx +Requires: python-Sphinx >= 1.7 Requires: python-numpy Requires: python-numpydoc BuildArch: noarch ++++++ astropy-helpers-3.2.2.tar.gz -> astropy-helpers-4.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astropy-helpers-3.2.2/CHANGES.rst new/astropy-helpers-4.0.1/CHANGES.rst --- old/astropy-helpers-3.2.2/CHANGES.rst 2019-10-27 01:50:58.000000000 +0200 +++ new/astropy-helpers-4.0.1/CHANGES.rst 2019-12-16 21:25:43.000000000 +0100 @@ -1,6 +1,23 @@ astropy-helpers Changelog ************************* +4.0.1 (2019-12-16) +------------------ + +- Fix pip installation. [#506] + + +4.0 (2019-12-13) +---------------- + +- Changed minimum required Python version to 3.6. [#498] + +- Changed minimum required Sphinx version to 1.7. [#498] + +- Added a --parallel option for build_docs. [#498] + +- Fix compatibility with setuptools 42.x. [#504] + 3.2.2 (2019-10-25) ------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astropy-helpers-3.2.2/MANIFEST.in new/astropy-helpers-4.0.1/MANIFEST.in --- old/astropy-helpers-3.2.2/MANIFEST.in 2018-05-17 01:45:56.000000000 +0200 +++ new/astropy-helpers-4.0.1/MANIFEST.in 2019-12-13 22:21:53.000000000 +0100 @@ -1,6 +1,7 @@ include README.rst include CHANGES.rst include LICENSE.rst +include pyproject.toml recursive-include licenses * include ah_bootstrap.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astropy-helpers-3.2.2/PKG-INFO new/astropy-helpers-4.0.1/PKG-INFO --- old/astropy-helpers-3.2.2/PKG-INFO 2019-10-27 02:43:39.000000000 +0200 +++ new/astropy-helpers-4.0.1/PKG-INFO 2019-12-16 21:26:10.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: astropy-helpers -Version: 3.2.2 +Version: 4.0.1 Summary: Utilities for building and installing packages in the Astropy ecosystem Home-page: https://github.com/astropy/astropy-helpers Author: The Astropy Developers @@ -26,9 +26,10 @@ Astropy-helpers is not a traditional package in the sense that it is not intended to be installed directly by users or developers. Instead, it is meant - to be accessed when the ``setup.py`` command is run - see the "Using - astropy-helpers in a package" section in the documentation for how - to do this. For a real-life example of how to implement astropy-helpers in a + to be accessed when the ``setup.py`` command is run - see the + "`Using astropy-helpers in a package <https://astropy-helpers.readthedocs.io/en/stable/using.html>`_" + section in the documentation for how to do this. + For a real-life example of how to implement astropy-helpers in a project, see the ``setup.py`` and ``setup.cfg`` files of the `Affiliated package template <https://github.com/astropy/package-template>`_. @@ -46,5 +47,5 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules Classifier: Topic :: System :: Archiving :: Packaging Provides: astropy_helpers -Requires-Python: >=3.5 +Requires-Python: >=3.6 Provides-Extra: docs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astropy-helpers-3.2.2/README.rst new/astropy-helpers-4.0.1/README.rst --- old/astropy-helpers-3.2.2/README.rst 2019-10-27 01:50:58.000000000 +0200 +++ new/astropy-helpers-4.0.1/README.rst 2019-11-18 02:57:11.000000000 +0100 @@ -18,9 +18,10 @@ Astropy-helpers is not a traditional package in the sense that it is not intended to be installed directly by users or developers. Instead, it is meant -to be accessed when the ``setup.py`` command is run - see the "Using -astropy-helpers in a package" section in the documentation for how -to do this. For a real-life example of how to implement astropy-helpers in a +to be accessed when the ``setup.py`` command is run - see the +"`Using astropy-helpers in a package <https://astropy-helpers.readthedocs.io/en/stable/using.html>`_" +section in the documentation for how to do this. +For a real-life example of how to implement astropy-helpers in a project, see the ``setup.py`` and ``setup.cfg`` files of the `Affiliated package template <https://github.com/astropy/package-template>`_. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astropy-helpers-3.2.2/ah_bootstrap.py new/astropy-helpers-4.0.1/ah_bootstrap.py --- old/astropy-helpers-3.2.2/ah_bootstrap.py 2019-10-27 01:50:58.000000000 +0200 +++ new/astropy-helpers-4.0.1/ah_bootstrap.py 2019-12-13 22:21:53.000000000 +0100 @@ -163,6 +163,8 @@ sys.stderr.write("ERROR: setuptools 30.3 or later is required by astropy-helpers\n") sys.exit(1) +SETUPTOOLS_LT_42 = LooseVersion(setuptools.__version__) < LooseVersion('42') + # typing as a dependency for 1.6.1+ Sphinx causes issues when imported after # initializing submodule with ah_boostrap.py # See discussion and references in @@ -533,7 +535,9 @@ opts['find_links'] = ('setup script', find_links) if index_url is not None: opts['index_url'] = ('setup script', index_url) - if allow_hosts is not None: + # For setuptools>=42, the allow_hosts option can't + # be used because pip doesn't support it. + if allow_hosts is not None and SETUPTOOLS_LT_42: opts['allow_hosts'] = ('setup script', allow_hosts) return opts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astropy-helpers-3.2.2/astropy_helpers/commands/build_sphinx.py new/astropy-helpers-4.0.1/astropy_helpers/commands/build_sphinx.py --- old/astropy-helpers-3.2.2/astropy_helpers/commands/build_sphinx.py 2019-10-27 01:50:58.000000000 +0200 +++ new/astropy-helpers-4.0.1/astropy_helpers/commands/build_sphinx.py 2019-11-18 02:57:11.000000000 +0100 @@ -9,12 +9,8 @@ from distutils import log -from sphinx import __version__ as sphinx_version from sphinx.setup_command import BuildDoc as SphinxBuildDoc -SPHINX_LT_16 = LooseVersion(sphinx_version) < LooseVersion('1.6') -SPHINX_LT_17 = LooseVersion(sphinx_version) < LooseVersion('1.7') - SUBPROCESS_TEMPLATE = """ import os import sys @@ -35,25 +31,17 @@ def ensure_sphinx_astropy_installed(): """ Make sure that sphinx-astropy is available. - - This returns the available version of sphinx-astropy as well as any - paths that should be added to sys.path for sphinx-astropy to be available. """ - # We've split out the Sphinx part of astropy-helpers into sphinx-astropy - # but we want it to be auto-installed seamlessly for anyone using - # build_docs. We check if it's already installed, and if not, we install - # it to a local .eggs directory and add the eggs to the path (these - # have to each be added to the path, we can't add them by simply adding - # .eggs to the path) - sys_path_inserts = [] - sphinx_astropy_version = None + try: from sphinx_astropy import __version__ as sphinx_astropy_version # noqa except ImportError: - raise ImportError("sphinx-astropy needs to be installed to build " - "the documentation.") + sphinx_astropy_version = None - return sphinx_astropy_version, sys_path_inserts + if (sphinx_astropy_version is None + or LooseVersion(sphinx_astropy_version) < LooseVersion('1.2')): + raise ImportError("sphinx-astropy 1.2 or later needs to be installed to build " + "the documentation.") class AstropyBuildDocs(SphinxBuildDoc): @@ -83,6 +71,11 @@ ('open-docs-in-browser', 'o', 'Open the docs in a browser (using the webbrowser module) if the ' 'build finishes successfully.')) + user_options.append( + ('parallel=', 'j', + 'Build the docs in parallel on the specified number of ' + 'processes. If "auto", all the cores on the machine will be ' + 'used.')) boolean_options = SphinxBuildDoc.boolean_options[:] boolean_options.append('warnings-returncode') @@ -99,6 +92,7 @@ self.open_docs_in_browser = False self.warnings_returncode = False self.traceback = False + self.parallel = None def finalize_options(self): @@ -149,15 +143,12 @@ else: ah_path = os.path.abspath(ah_importer.path) - if SPHINX_LT_17: - build_main = 'from sphinx import build_main' - else: - build_main = 'from sphinx.cmd.build import build_main' + build_main = 'from sphinx.cmd.build import build_main' # We need to make sure sphinx-astropy is installed - sphinx_astropy_version, extra_paths = ensure_sphinx_astropy_installed() + ensure_sphinx_astropy_installed() - sys_path_inserts = [build_cmd_path, ah_path] + extra_paths + sys_path_inserts = [build_cmd_path, ah_path] sys_path_inserts = os.linesep.join(['sys.path.insert(0, {0!r})'.format(path) for path in sys_path_inserts]) argv = [] @@ -166,14 +157,7 @@ argv.append('-W') if self.no_intersphinx: - # Note, if sphinx_astropy_version is None, this could indicate an - # old version of setuptools, but sphinx-astropy is likely ok, so - # we can proceed. - if sphinx_astropy_version is None or LooseVersion(sphinx_astropy_version) >= LooseVersion('1.1'): - argv.extend(['-D', 'disable_intersphinx=1']) - else: - log.warn('The -n option to disable intersphinx requires ' - 'sphinx-astropy>=1.1. Ignoring.') + argv.extend(['-D', 'disable_intersphinx=1']) # We now need to adjust the flags based on the parent class's options @@ -198,8 +182,8 @@ elif self.verbose > 1: argv.append('-v') - if SPHINX_LT_17: - argv.insert(0, 'sphinx-build') + if self.parallel is not None: + argv.append(f'-j={self.parallel}') if isinstance(self.builder, str): builders = [self.builder] @@ -207,11 +191,11 @@ builders = self.builder subproccode = SUBPROCESS_TEMPLATE.format(build_main=build_main, - srcdir=self.source_dir, - sys_path_inserts=sys_path_inserts, - builders=builders, - argv=argv, - output_dir=os.path.abspath(self.build_dir)) + srcdir=self.source_dir, + sys_path_inserts=sys_path_inserts, + builders=builders, + argv=argv, + output_dir=os.path.abspath(self.build_dir)) log.debug('Starting subprocess of {0} with python code:\n{1}\n' '[CODE END])'.format(sys.executable, subproccode)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astropy-helpers-3.2.2/astropy_helpers/version.py new/astropy-helpers-4.0.1/astropy_helpers/version.py --- old/astropy-helpers-3.2.2/astropy_helpers/version.py 2019-10-27 02:43:39.000000000 +0200 +++ new/astropy-helpers-4.0.1/astropy_helpers/version.py 2019-12-16 21:26:10.000000000 +0100 @@ -1,18 +1,18 @@ -# Autogenerated by Astropy-affiliated package astropy_helpers's setup.py on 2019-10-27 00:43:39 UTC +# Autogenerated by Astropy-affiliated package astropy_helpers's setup.py on 2019-12-16 20:26:10 UTC import datetime -version = "3.2.2" -githash = "ce42e6e238c200a4715785ef8c9d233f612d0c75" +version = "4.0.1" +githash = "d2a6304a3e801bc2cb053ccf1cf09a9f1e62036c" -major = 3 -minor = 2 -bugfix = 2 +major = 4 +minor = 0 +bugfix = 1 version_info = (major, minor, bugfix) release = True -timestamp = datetime.datetime(2019, 10, 27, 0, 43, 39) +timestamp = datetime.datetime(2019, 12, 16, 20, 26, 10) debug = False astropy_helpers_version = "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astropy-helpers-3.2.2/astropy_helpers.egg-info/PKG-INFO new/astropy-helpers-4.0.1/astropy_helpers.egg-info/PKG-INFO --- old/astropy-helpers-3.2.2/astropy_helpers.egg-info/PKG-INFO 2019-10-27 02:43:39.000000000 +0200 +++ new/astropy-helpers-4.0.1/astropy_helpers.egg-info/PKG-INFO 2019-12-16 21:26:10.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: astropy-helpers -Version: 3.2.2 +Version: 4.0.1 Summary: Utilities for building and installing packages in the Astropy ecosystem Home-page: https://github.com/astropy/astropy-helpers Author: The Astropy Developers @@ -26,9 +26,10 @@ Astropy-helpers is not a traditional package in the sense that it is not intended to be installed directly by users or developers. Instead, it is meant - to be accessed when the ``setup.py`` command is run - see the "Using - astropy-helpers in a package" section in the documentation for how - to do this. For a real-life example of how to implement astropy-helpers in a + to be accessed when the ``setup.py`` command is run - see the + "`Using astropy-helpers in a package <https://astropy-helpers.readthedocs.io/en/stable/using.html>`_" + section in the documentation for how to do this. + For a real-life example of how to implement astropy-helpers in a project, see the ``setup.py`` and ``setup.cfg`` files of the `Affiliated package template <https://github.com/astropy/package-template>`_. @@ -46,5 +47,5 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules Classifier: Topic :: System :: Archiving :: Packaging Provides: astropy_helpers -Requires-Python: >=3.5 +Requires-Python: >=3.6 Provides-Extra: docs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astropy-helpers-3.2.2/astropy_helpers.egg-info/SOURCES.txt new/astropy-helpers-4.0.1/astropy_helpers.egg-info/SOURCES.txt --- old/astropy-helpers-3.2.2/astropy_helpers.egg-info/SOURCES.txt 2019-10-27 02:43:39.000000000 +0200 +++ new/astropy-helpers-4.0.1/astropy_helpers.egg-info/SOURCES.txt 2019-12-16 21:26:10.000000000 +0100 @@ -3,6 +3,7 @@ MANIFEST.in README.rst ah_bootstrap.py +pyproject.toml setup.cfg setup.py astropy_helpers/__init__.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astropy-helpers-3.2.2/pyproject.toml new/astropy-helpers-4.0.1/pyproject.toml --- old/astropy-helpers-3.2.2/pyproject.toml 1970-01-01 01:00:00.000000000 +0100 +++ new/astropy-helpers-4.0.1/pyproject.toml 2019-12-13 22:21:53.000000000 +0100 @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools", "wheel"] +build-backend = 'setuptools.build_meta' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astropy-helpers-3.2.2/setup.cfg new/astropy-helpers-4.0.1/setup.cfg --- old/astropy-helpers-3.2.2/setup.cfg 2019-10-27 02:43:39.000000000 +0200 +++ new/astropy-helpers-4.0.1/setup.cfg 2019-12-16 21:26:10.000000000 +0100 @@ -1,6 +1,6 @@ [metadata] name = astropy-helpers -version = 3.2.2 +version = 4.0.1 provides = astropy_helpers author = The Astropy Developers author_email = astropy.t...@gmail.com @@ -23,7 +23,7 @@ [options] zip_safe = False -python_requires = >=3.5 +python_requires = >=3.6 packages = find: [options.package_data] @@ -38,6 +38,9 @@ astropy_helpers/tests/package_template python_functions = test_ +[bdist_wheel] +universal = 1 + [egg_info] tag_build = tag_date = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astropy-helpers-3.2.2/setup.py new/astropy-helpers-4.0.1/setup.py --- old/astropy-helpers-3.2.2/setup.py 2019-10-27 01:50:58.000000000 +0200 +++ new/astropy-helpers-4.0.1/setup.py 2019-12-16 20:19:55.000000000 +0100 @@ -4,6 +4,7 @@ # NOTE: most of the configuration, including the version number, # is defined in setup.cfg +import os import sys from distutils.version import LooseVersion @@ -14,6 +15,10 @@ sys.stderr.write("ERROR: setuptools 30.3 or later is required by astropy-helpers\n") sys.exit(1) +# Need to add current directory to be able to import astropy-helpers +# despite PEP517/518 build isolation +sys.path.append(os.path.abspath(".")) + from astropy_helpers.version_helpers import generate_version_py # noqa version = generate_version_py()