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 2021-12-30 15:55:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-asdf (Old) and /work/SRC/openSUSE:Factory/.python-asdf.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-asdf" Thu Dec 30 15:55:45 2021 rev:15 rq:943222 version:2.8.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-asdf/python-asdf.changes 2021-12-14 22:02:44.071166341 +0100 +++ /work/SRC/openSUSE:Factory/.python-asdf.new.1896/python-asdf.changes 2021-12-30 15:56:12.604691067 +0100 @@ -1,0 +2,7 @@ +Tue Dec 28 18:57:17 UTC 2021 - Ben Greiner <code@bnavigator.de> + +- Add patches for working with newer gwcs and asdf-astropy + * asdf-pr1034-tags.patch + * asdf-standard-pr289-schema.patch + +------------------------------------------------------------------- New: ---- asdf-pr1034-tags.patch asdf-standard-pr289-schema.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-asdf.spec ++++++ --- /var/tmp/diff_new_pack.IcVyyJ/_old 2021-12-30 15:56:13.092691443 +0100 +++ /var/tmp/diff_new_pack.IcVyyJ/_new 2021-12-30 15:56:13.096691447 +0100 @@ -35,6 +35,10 @@ License: BSD-2-Clause AND BSD-3-Clause URL: https://github.com/asdf-format/asdf Source0: https://files.pythonhosted.org/packages/source/a/asdf/asdf-%{version}.tar.gz +# PATCH-FIX-UPSTREAM asdf-pr1034-tags.patch -- gh#asdf-format/asdf#1034 +Patch0: asdf-pr1034-tags.patch +# PATCH-FIX-UPSTREAM asdf-standard-pr289-schema.patch -- gh#asdf-format/asdf-standard#289 +Patch1: asdf-standard-pr289-schema.patch BuildRequires: %{python_module PyYAML >= 3.10} BuildRequires: %{python_module importlib-resources >= 3 if %python-base < 3.9} BuildRequires: %{python_module jmespath >= 0.6.2} @@ -79,7 +83,7 @@ Python implementation of the ASDF Standard. %prep -%setup -q -n asdf-%{version} +%autosetup -p1 -n asdf-%{version} sed -i -e '/^#!\//, 1d' asdf/extern/RangeHTTPServer.py chmod a-x asdf/extern/RangeHTTPServer.py sed -i 's/\r$//' asdf/tests/data/example_schema.json ++++++ asdf-pr1034-tags.patch ++++++ From b596cee93d1d95c11c563de2bac67cc76d1ceb19 Mon Sep 17 00:00:00 2001 From: Ed Slavich <eslavich@stsci.edu> Date: Mon, 13 Dec 2021 14:44:31 -0500 Subject: [PATCH] Fix tag listing when extension is not fully implemented --- CHANGES.rst | 5 ++++ asdf/commands/tags.py | 2 +- asdf/commands/tests/test_tags.py | 2 +- asdf/tests/test_types.py | 41 -------------------------------- 4 files changed, 7 insertions(+), 43 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 8529fb6a5..1e142e4e4 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,8 @@ +2.8.4 (unreleased) +------------------ + +- Fix tag listing when extension is not fully implemented. [#1034] + 2.8.3 (2021-12-13) ------------------ diff --git a/asdf/commands/tags.py b/asdf/commands/tags.py index e7fa47df4..ae61aabc4 100644 --- a/asdf/commands/tags.py +++ b/asdf/commands/tags.py @@ -45,7 +45,7 @@ def list_tags(display_classes=False, iostream=sys.stdout): af = AsdfFile() tag_pairs = [] - for tag in af.extension_manager._tag_defs_by_tag: + for tag in af.extension_manager._converters_by_tag: tag_pairs.append((tag, af.extension_manager.get_converter_for_tag(tag).types)) for tag in af.type_index._type_by_tag: tag_pairs.append((tag, [af.type_index._type_by_tag[tag]])) diff --git a/asdf/commands/tests/test_tags.py b/asdf/commands/tests/test_tags.py index fe676a213..aec0027c1 100644 --- a/asdf/commands/tests/test_tags.py +++ b/asdf/commands/tests/test_tags.py @@ -21,5 +21,5 @@ def test_all_tags_present(): af = AsdfFile() for tag in af.type_index._type_by_tag: assert tag in tags - for tag in af.extension_manager._tag_defs_by_tag: + for tag in af.extension_manager._converters_by_tag: assert tag in tags diff --git a/asdf/tests/test_types.py b/asdf/tests/test_types.py index 32ea2ee0f..b7bfc29b5 100644 --- a/asdf/tests/test_types.py +++ b/asdf/tests/test_types.py @@ -604,47 +604,6 @@ def types(self): asdf.open(buff, extensions=CustomFlowExtension()) -def test_extension_override(tmpdir): - - gwcs = pytest.importorskip('gwcs', '0.12.0') - - version = str(versioning.default_version) - tmpfile = str(tmpdir.join('override.asdf')) - - with asdf.AsdfFile() as aa: - assert aa.type_index.from_custom_type(gwcs.WCS, version=version) is gwcs.tags.wcs.WCSType - aa.tree['wcs'] = gwcs.WCS(output_frame='icrs') - aa.write_to(tmpfile) - - with open(tmpfile, 'rb') as ff: - contents = str(ff.read()) - assert gwcs.tags.wcs.WCSType.yaml_tag in contents - - -def test_extension_override_subclass(tmpdir): - - gwcs = pytest.importorskip('gwcs', '0.12.0') - pytest.importorskip('astropy', '4.0.0') - - version = str(versioning.default_version) - tmpfile = str(tmpdir.join('override.asdf')) - - class SubclassWCS(gwcs.WCS): - pass - - with asdf.AsdfFile() as aa: - assert aa.type_index.from_custom_type(gwcs.WCS, version=version) is gwcs.tags.wcs.WCSType - assert aa.type_index.from_custom_type(SubclassWCS, version=version) is gwcs.tags.wcs.WCSType - # The duplication here is deliberate: make sure that nothing has changed - assert aa.type_index.from_custom_type(gwcs.WCS, version=version) is gwcs.tags.wcs.WCSType - aa.tree['wcs'] = SubclassWCS(output_frame='icrs') - aa.write_to(tmpfile) - - with open(tmpfile, 'rb') as ff: - contents = str(ff.read()) - assert gwcs.tags.wcs.WCSType.yaml_tag in contents - - def test_tag_without_schema(tmpdir): tmpfile = str(tmpdir.join('foo.asdf')) ++++++ asdf-standard-pr289-schema.patch ++++++ ++++ 705 lines (skipped)