Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-asdf for openSUSE:Factory checked in at 2022-04-30 22:52:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-asdf (Old) and /work/SRC/openSUSE:Factory/.python-asdf.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-asdf" Sat Apr 30 22:52:03 2022 rev:17 rq:973211 version:2.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-asdf/python-asdf.changes 2022-03-16 21:15:32.982854758 +0100 +++ /work/SRC/openSUSE:Factory/.python-asdf.new.1538/python-asdf.changes 2022-04-30 22:52:09.588193566 +0200 @@ -1,0 +2,8 @@ +Tue Apr 26 11:36:22 UTC 2022 - Ben Greiner <[email protected]> + +- Update to 2.11.1 + * Update minimum astropy version to 5.0.4. [#1133] + * Update minimum jsonschema version to 4.0.1. [#1105] +- Collect tests from installed sitelib -- gh#pytest-dev/pytest#9765 + +------------------------------------------------------------------- Old: ---- asdf-2.10.1.tar.gz New: ---- asdf-2.11.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-asdf.spec ++++++ --- /var/tmp/diff_new_pack.YVrWLf/_old 2022-04-30 22:52:10.132194302 +0200 +++ /var/tmp/diff_new_pack.YVrWLf/_new 2022-04-30 22:52:10.136194307 +0200 @@ -28,7 +28,7 @@ %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 Name: python-asdf%{psuffix} -Version: 2.10.1 +Version: 2.11.1 Release: 0 Summary: Python tools to handle ASDF files License: BSD-2-Clause AND BSD-3-Clause @@ -44,7 +44,7 @@ Requires: python-asdf-standard >= 1.0.1 Requires: python-asdf-transform-schemas >= 0.2.2 Requires: python-jmespath >= 0.6.2 -Requires: python-jsonschema >= 3.0.2 +Requires: python-jsonschema >= 4.0.1 Requires: python-numpy >= 1.10 Requires: python-packaging >= 16.0 Requires: python-semantic_version >= 2.8 @@ -58,12 +58,13 @@ # SECTION test requirements %if %{with test} BuildRequires: %{python_module asdf = %{version}} -BuildRequires: %{python_module astropy} +BuildRequires: %{python_module astropy >= 5.0.4} BuildRequires: %{python_module gwcs} BuildRequires: %{python_module lz4} BuildRequires: %{python_module psutil} BuildRequires: %{python_module pytest-doctestplus} BuildRequires: %{python_module pytest-openfiles >= 0.3.1} +BuildRequires: %{python_module pytest-remotedata} BuildRequires: %{python_module pytest-sugar} BuildRequires: %{python_module pytest} %endif @@ -96,8 +97,9 @@ %check %if %{with test} export LANG=en_US.UTF-8 -export PY_IGNORE_IMPORTMISMATCH=1 -%pytest +# remove source directory in order to avoid import mismatches +mv asdf asdf.moved +%pytest --pyargs asdf --remote-data=none %endif %post ++++++ asdf-2.10.1.tar.gz -> asdf-2.11.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/.github/workflows/ci.yml new/asdf-2.11.1/.github/workflows/ci.yml --- old/asdf-2.10.1/.github/workflows/ci.yml 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/.github/workflows/ci.yml 2022-04-18 21:11:29.000000000 +0200 @@ -33,15 +33,10 @@ python-version: "3.8" toxenv: py38 - - name: Python 3.7 Testing + - name: Python 3.8 with legacy packages os: ubuntu-latest - python-version: "3.7" - toxenv: py37 - - - name: Python 3.7 with legacy packages - os: ubuntu-latest - python-version: "3.7" - toxenv: py37-legacy + python-version: "3.8" + toxenv: py38-legacy - name: Mac OS Latest os: macos-latest @@ -117,7 +112,7 @@ - name: Warnings Treated as Exceptions os: ubuntu-latest - python-version: "3.9" + python-version: "3.10" toxenv: warnings - name: Windows diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/.github/workflows/downstream.yml new/asdf-2.11.1/.github/workflows/downstream.yml --- old/asdf-2.10.1/.github/workflows/downstream.yml 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/.github/workflows/downstream.yml 2022-04-18 21:11:29.000000000 +0200 @@ -47,6 +47,11 @@ ref: master install_command: pip install -e .[test] test_command: pytest + - package_name: stdatamodels + repository: spacetelescope/stdatamodels + ref: master + install_command: pip install -e .[test] + test_command: pytest - package_name: roman_datamodels repository: spacetelescope/roman_datamodels ref: main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/.github/workflows/s390x.yml new/asdf-2.11.1/.github/workflows/s390x.yml --- old/asdf-2.10.1/.github/workflows/s390x.yml 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/.github/workflows/s390x.yml 2022-04-18 21:11:29.000000000 +0200 @@ -2,38 +2,57 @@ on: workflow_dispatch: - push: - tags: - - '*' schedule: # Run every Monday at 6am UTC - cron: '0 6 * * 1' + pull_request: + # We also want this workflow triggered if the `s390x` label is + # added or present when PR is updated + types: + - synchronize + - labeled + push: + branches: + - '*.*.x' + tags: + - '*' jobs: pytest: + name: Python 3.8 runs-on: ubuntu-18.04 - name: Python 3.7 + if: (github.repository == 'asdf-format/asdf' && (github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 's390x'))) steps: - uses: actions/checkout@v2 with: fetch-depth: 0 submodules: true - - uses: uraimo/[email protected] + - uses: uraimo/[email protected] name: Run tests id: build with: arch: s390x - distro: buster + distro: bullseye shell: /bin/bash install: | + echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list apt-get update -q -y apt-get install -q -y git \ + g++ \ + pkg-config \ python3 \ + python3-configobj \ python3-astropy \ python3-lz4 \ python3-numpy \ + python3-ply \ python3-venv \ - python3-wheel + python3-wheel \ + cython3 \ + libwcs7/bullseye-backports \ + wcslib-dev/bullseye-backports \ + libcfitsio-dev \ + liberfa1 run: | python3 -m venv --system-site-packages tests source tests/bin/activate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/CHANGES.rst new/asdf-2.11.1/CHANGES.rst --- old/asdf-2.10.1/CHANGES.rst 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/CHANGES.rst 2022-04-18 21:11:29.000000000 +0200 @@ -1,7 +1,18 @@ +2.11.1 (2022-04-15) +------------------- + +- Update minimum astropy version to 5.0.4. [#1133] + +2.11.0 (2022-03-15) +------------------- + +- Update minimum jsonschema version to 4.0.1. [#1105] + 2.10.1 (2022-03-02) ------------------- - Bugfix for circular build dependency for asdf. [#1094] + - Fix small bug with handling multiple schema uris per tag. [#1095] 2.10.0 (2022-02-17) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/PKG-INFO new/asdf-2.11.1/PKG-INFO --- old/asdf-2.10.1/PKG-INFO 2022-03-02 21:50:52.617157700 +0100 +++ new/asdf-2.11.1/PKG-INFO 2022-04-18 21:11:47.276027400 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: asdf -Version: 2.10.1 +Version: 2.11.1 Summary: Python implementation of the ASDF Standard Home-page: http://github.com/asdf-format/asdf Author: The ASDF Developers @@ -311,7 +311,6 @@ :: $ cd asdf - $ git submodule update --init $ pip install . To install in `development @@ -319,16 +318,6 @@ $ pip install -e . -.. note:: - - The source repository makes use of a git submodule for referencing the - schemas provided by the ASDF standard. While this submodule is - automatically initialized when installing the package (including in - development mode), it may be necessary for developers to manually update - the submodule if changes are made upstream. See the `documentation on git - submodules <https://git-scm.com/docs/git-submodule>`__ for more - information. - .. _end-source-install-text: Testing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/README.rst new/asdf-2.11.1/README.rst --- old/asdf-2.10.1/README.rst 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/README.rst 2022-04-18 21:11:29.000000000 +0200 @@ -285,7 +285,6 @@ :: $ cd asdf - $ git submodule update --init $ pip install . To install in `development @@ -293,16 +292,6 @@ $ pip install -e . -.. note:: - - The source repository makes use of a git submodule for referencing the - schemas provided by the ASDF standard. While this submodule is - automatically initialized when installing the package (including in - development mode), it may be necessary for developers to manually update - the submodule if changes are made upstream. See the `documentation on git - submodules <https://git-scm.com/docs/git-submodule>`__ for more - information. - .. _end-source-install-text: Testing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/asdf/__init__.py new/asdf-2.11.1/asdf/__init__.py --- old/asdf-2.10.1/asdf/__init__.py 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/asdf/__init__.py 2022-04-18 21:11:29.000000000 +0200 @@ -22,6 +22,7 @@ from jsonschema import ValidationError from ._convenience import info +from ._version import version as __version__ from .asdf import AsdfFile from .asdf import open_asdf as open from .config import config_context, get_config @@ -30,4 +31,3 @@ from .tags.core import IntegerType from .tags.core.external_reference import ExternalArrayReference from .types import CustomType -from .version import version as __version__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/asdf/_helpers.py new/asdf-2.11.1/asdf/_helpers.py --- old/asdf-2.10.1/asdf/_helpers.py 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/asdf/_helpers.py 2022-04-18 21:11:29.000000000 +0200 @@ -1,5 +1,5 @@ from . import versioning -from .version import version as asdf_package_version +from ._version import version as asdf_package_version def validate_version(version): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/asdf/_version.py new/asdf-2.11.1/asdf/_version.py --- old/asdf-2.10.1/asdf/_version.py 1970-01-01 01:00:00.000000000 +0100 +++ new/asdf-2.11.1/asdf/_version.py 2022-04-18 21:11:46.000000000 +0200 @@ -0,0 +1,5 @@ +# coding: utf-8 +# file generated by setuptools_scm +# don't change, don't track in version control +version = '2.11.1' +version_tuple = (2, 11, 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/asdf/asdf.py new/asdf-2.11.1/asdf/asdf.py --- old/asdf-2.10.1/asdf/asdf.py 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/asdf/asdf.py 2022-04-18 21:11:29.000000000 +0200 @@ -10,7 +10,8 @@ from pkg_resources import parse_version from . import _display as display -from . import block, constants, generic_io, reference, schema, treeutil, util, version, versioning, yamlutil +from . import _version as version +from . import block, constants, generic_io, reference, schema, treeutil, util, versioning, yamlutil from ._helpers import validate_version from .config import config_context, get_config from .exceptions import AsdfConversionWarning, AsdfDeprecationWarning, AsdfWarning diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/asdf/schema.py new/asdf-2.11.1/asdf/schema.py --- old/asdf-2.10.1/asdf/schema.py 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/asdf/schema.py 2022-04-18 21:11:29.000000000 +0200 @@ -7,10 +7,11 @@ from functools import lru_cache from numbers import Integral +import attr import numpy as np import yaml from jsonschema import validators as mvalidators -from jsonschema.exceptions import ValidationError +from jsonschema.exceptions import RefResolutionError, ValidationError from . import constants, extension, generic_io, reference, tagged, treeutil, util, versioning, yamlutil from .config import get_config @@ -258,34 +259,30 @@ meta_schema=meta_schema, validators=validators, type_checker=type_checker, id_of=id_of ) + @attr.s class ASDFValidator(base_cls): - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self._context = _ValidationContext() + _context = attr.ib(factory=lambda: _ValidationContext()) + ctx = attr.ib(default=None) + serialization_context = attr.ib(default=None) - def iter_errors(self, instance, _schema=None): + def iter_errors(self, instance, *args, **kwargs): # We can't validate anything that looks like an external reference, # since we don't have the actual content, so we just have to defer # it for now. If the user cares about complete validation, they # can call `AsdfFile.resolve_references`. with self._context: - if _schema is None: - schema = self.schema - else: - schema = _schema - - if self._context.seen(instance, schema): + if self._context.seen(instance, self.schema): # We've already validated this instance against this schema, # no need to do it again. return if not visit_repeat_nodes: - self._context.add(instance, schema) + self._context.add(instance, self.schema) if (isinstance(instance, dict) and "$ref" in instance) or isinstance(instance, reference.Reference): return - if _schema is None: + if not self.schema: tag = getattr(instance, "_tag", None) if tag is not None: if self.serialization_context.extension_manager.handles_tag_definition(tag): @@ -299,15 +296,11 @@ # Must validate against all schema_uris for schema_uri in schema_uris: try: - s = _load_schema_cached(schema_uri, self.ctx.resolver, False, False) - except FileNotFoundError: + with self.resolver.resolving(schema_uri) as resolved: + yield from self.descend(instance, resolved) + except RefResolutionError: msg = "Unable to locate schema file for '{}': '{}'" warnings.warn(msg.format(tag, schema_uri), AsdfWarning) - s = {} - if s: - with self.resolver.in_scope(schema_uri): - for x in super(ASDFValidator, self).iter_errors(instance, s): - yield x if isinstance(instance, dict): for val in instance.values(): @@ -319,8 +312,7 @@ for x in self.iter_errors(val): yield x else: - for x in super(ASDFValidator, self).iter_errors(instance, _schema=schema): - yield x + yield from super(ASDFValidator, self).iter_errors(instance) return ASDFValidator @@ -580,10 +572,7 @@ # test suite!!!). Instead, we assume that the schemas are valid # through the running of the unit tests, not at run time. cls = _create_validator(validators=validators, visit_repeat_nodes=_visit_repeat_nodes) - validator = cls(schema, *args, **kwargs) - validator.ctx = ctx - validator.serialization_context = _serialization_context - return validator + return cls(schema, *args, ctx=ctx, serialization_context=_serialization_context, **kwargs) def _validate_large_literals(instance, reading): @@ -670,7 +659,7 @@ ctx = AsdfFile() validator = get_validator(schema, ctx, validators, ctx.resolver, *args, **kwargs) - validator.validate(instance, _schema=(schema or None)) + validator.validate(instance) additional_validators = [_validate_large_literals] if ctx.version >= versioning.RESTRICTED_KEYS_MIN_VERSION: @@ -742,9 +731,11 @@ return if "default" in instance: - with instance_validator.resolver.in_scope(instance_scope): - for err in instance_validator.iter_errors(instance["default"], instance): - yield err + instance_validator.resolver.push_scope(instance_scope) + try: + yield from instance_validator.descend(instance["default"], instance) + finally: + instance_validator.resolver.pop_scope() validators.update({"default": _validate_default}) @@ -760,4 +751,4 @@ id_of=mvalidators.Draft4Validator.ID_OF, ) validator = cls(meta_schema, resolver=resolver) - validator.validate(schema, _schema=meta_schema) + validator.validate(schema) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/asdf/tests/test_entry_points.py new/asdf-2.11.1/asdf/tests/test_entry_points.py --- old/asdf-2.10.1/asdf/tests/test_entry_points.py 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/asdf/tests/test_entry_points.py 2022-04-18 21:11:29.000000000 +0200 @@ -3,10 +3,10 @@ from pkg_resources import EntryPoint from asdf import entry_points +from asdf._version import version as asdf_package_version from asdf.exceptions import AsdfWarning from asdf.extension import ExtensionProxy from asdf.resource import ResourceMappingProxy -from asdf.version import version as asdf_package_version @pytest.fixture diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/asdf/tests/test_schema.py new/asdf-2.11.1/asdf/tests/test_schema.py --- old/asdf-2.10.1/asdf/tests/test_schema.py 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/asdf/tests/test_schema.py 2022-04-18 21:11:29.000000000 +0200 @@ -401,13 +401,13 @@ cls = schema._create_validator(schema.FILL_DEFAULTS) validator = cls(s) - validator.validate(t, _schema=s) + validator.validate(t) assert t["a"] == 42 cls = schema._create_validator(schema.REMOVE_DEFAULTS) validator = cls(s) - validator.validate(t, _schema=s) + validator.validate(t) assert t == {} @@ -1070,9 +1070,9 @@ ) def test_numpy_scalar_type_validation(numpy_value, valid_types): def _assert_validation(jsonschema_type, expected_valid): - validator = schema.get_validator() + validator = schema.get_validator(schema={"type": jsonschema_type}) try: - validator.validate(numpy_value, _schema={"type": jsonschema_type}) + validator.validate(numpy_value) except ValidationError: valid = False else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/asdf/version.py new/asdf-2.11.1/asdf/version.py --- old/asdf-2.10.1/asdf/version.py 2022-03-02 21:50:52.000000000 +0100 +++ new/asdf-2.11.1/asdf/version.py 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -version = "2.10.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/asdf.egg-info/PKG-INFO new/asdf-2.11.1/asdf.egg-info/PKG-INFO --- old/asdf-2.10.1/asdf.egg-info/PKG-INFO 2022-03-02 21:50:52.000000000 +0100 +++ new/asdf-2.11.1/asdf.egg-info/PKG-INFO 2022-04-18 21:11:46.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: asdf -Version: 2.10.1 +Version: 2.11.1 Summary: Python implementation of the ASDF Standard Home-page: http://github.com/asdf-format/asdf Author: The ASDF Developers @@ -311,7 +311,6 @@ :: $ cd asdf - $ git submodule update --init $ pip install . To install in `development @@ -319,16 +318,6 @@ $ pip install -e . -.. note:: - - The source repository makes use of a git submodule for referencing the - schemas provided by the ASDF standard. While this submodule is - automatically initialized when installing the package (including in - development mode), it may be necessary for developers to manually update - the submodule if changes are made upstream. See the `documentation on git - submodules <https://git-scm.com/docs/git-submodule>`__ for more - information. - .. _end-source-install-text: Testing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/asdf.egg-info/SOURCES.txt new/asdf-2.11.1/asdf.egg-info/SOURCES.txt --- old/asdf-2.10.1/asdf.egg-info/SOURCES.txt 2022-03-02 21:50:52.000000000 +0100 +++ new/asdf-2.11.1/asdf.egg-info/SOURCES.txt 2022-04-18 21:11:47.000000000 +0200 @@ -19,6 +19,7 @@ asdf/_convenience.py asdf/_display.py asdf/_helpers.py +asdf/_version.py asdf/asdf.py asdf/asdftypes.py asdf/block.py @@ -41,7 +42,6 @@ asdf/type_index.py asdf/types.py asdf/util.py -asdf/version.py asdf/versioning.py asdf/yamlutil.py asdf.egg-info/PKG-INFO diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/asdf.egg-info/requires.txt new/asdf-2.11.1/asdf.egg-info/requires.txt --- old/asdf-2.10.1/asdf.egg-info/requires.txt 2022-03-02 21:50:52.000000000 +0100 +++ new/asdf-2.11.1/asdf.egg-info/requires.txt 2022-04-18 21:11:47.000000000 +0200 @@ -1,5 +1,5 @@ jmespath>=0.6.2 -jsonschema<4,>=3.0.2 +jsonschema>=4.0.1 numpy>=1.10 packaging>=16.0 pyyaml>=3.10 @@ -7,6 +7,9 @@ asdf-standard>=1.0.1 asdf-transform-schemas>=0.2.2 +[:python_version < "3.8"] +six + [:python_version < "3.9"] importlib_resources>=3 @@ -16,14 +19,13 @@ [docs] sphinx sphinx-astropy -astropy +astropy>=5.0.4 graphviz matplotlib docutils [tests] -pytest -astropy +astropy>=5.0.4 gwcs pytest-doctestplus pytest-remotedata @@ -31,3 +33,9 @@ pytest-sugar psutil lz4>=0.10 + +[tests:sys_platform != "win32"] +pytest + +[tests:sys_platform == "win32"] +pytest!=7.1.0,!=7.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/docs/asdf/changes.rst new/asdf-2.11.1/docs/asdf/changes.rst --- old/asdf-2.10.1/docs/asdf/changes.rst 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/docs/asdf/changes.rst 2022-04-18 21:11:29.000000000 +0200 @@ -4,6 +4,24 @@ Changes ******* +What's new in asdf 2.11.1? +========================== + +The ASDF Standard is at v1.6.0. + +Changes include: + +- Update minimum astropy version to 5.0.4. + +What's new in asdf 2.11.0? +========================== + +The ASDF Standard is at v1.6.0. + +Changes include: + +- Update minimum jsonschema version to 4.0.1. + What's new in asdf 2.10.1? ========================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/docs/asdf/config.rst new/asdf-2.11.1/docs/asdf/config.rst --- old/asdf-2.10.1/docs/asdf/config.rst 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/docs/asdf/config.rst 2022-04-18 21:11:29.000000000 +0200 @@ -99,7 +99,7 @@ on an individual file basis (using the version argument to ``AsdfFile.__init__``) or set here to change the default for all new files created in the current session. -Defaults to the latest supported ASDF Standard version. +Defaults to the latest stable ASDF Standard version. io_block_size ------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/pyproject.toml new/asdf-2.11.1/pyproject.toml --- old/asdf-2.10.1/pyproject.toml 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/pyproject.toml 2022-04-18 21:11:29.000000000 +0200 @@ -1,5 +1,9 @@ [build-system] -requires = ["setuptools>=30.3.0", "setuptools_scm", "wheel"] +requires = ["setuptools>=42", "setuptools_scm[toml]>=3.4", "wheel"] +build-backend = "setuptools.build_meta" + +[tool.setuptools_scm] +write_to = "asdf/_version.py" [tool.black] line-length = 120 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/setup.cfg new/asdf-2.11.1/setup.cfg --- old/asdf-2.10.1/setup.cfg 2022-03-02 21:50:52.617157700 +0100 +++ new/asdf-2.11.1/setup.cfg 2022-04-18 21:11:47.276027400 +0200 @@ -28,13 +28,14 @@ install_requires = importlib_resources>=3;python_version<"3.9" jmespath>=0.6.2 - jsonschema>=3.0.2,<4 + jsonschema>=4.0.1 numpy>=1.10 packaging>=16.0 pyyaml>=3.10 semantic_version>=2.8 asdf-standard>=1.0.1 asdf-transform-schemas>=0.2.2 + six;python_version<"3.8" [options.extras_require] all = @@ -42,13 +43,14 @@ docs = sphinx sphinx-astropy - astropy + astropy>=5.0.4 graphviz matplotlib docutils tests = - pytest - astropy + pytest!=7.1.0, !=7.1.1;sys_platform=="win32" + pytest;sys_platform!="win32" + astropy>=5.0.4 gwcs pytest-doctestplus pytest-remotedata diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/setup.py new/asdf-2.11.1/setup.py --- old/asdf-2.10.1/setup.py 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/setup.py 2022-04-18 21:11:29.000000000 +0200 @@ -1,5 +1,4 @@ #!/usr/bin/env python -import os from pathlib import Path from setuptools import setup @@ -17,9 +16,5 @@ } setup( - use_scm_version={ - "write_to": os.path.join("asdf", "version.py"), - "write_to_template": 'version = "{version}"\n', - }, package_data=package_data, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf-2.10.1/tox.ini new/asdf-2.11.1/tox.ini --- old/asdf-2.10.1/tox.ini 2022-03-02 21:50:44.000000000 +0100 +++ new/asdf-2.11.1/tox.ini 2022-04-18 21:11:29.000000000 +0200 @@ -18,7 +18,7 @@ legacy: gwcs==0.9.1 legacy: semantic_version==2.8 legacy: pyyaml==3.13 - legacy: jsonschema==3.0.2 + legacy: jsonschema==4.0.1 legacy: numpy~=1.14.6 legacy: pytest~=4.6.11 legacy: astropy~=3.0.0
