From 88e7adb879c2e48abc27f6ecd81259f51b053a3c Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 10 Aug 2023 11:01:53 -0400 Subject: [PATCH 1/8] import ValidationError from asdf, drop jsonschema as a dependency --- dkist/dataset/loader.py | 2 +- setup.cfg | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dkist/dataset/loader.py b/dkist/dataset/loader.py index 6cda45ca..441958c9 100644 --- a/dkist/dataset/loader.py +++ b/dkist/dataset/loader.py @@ -2,7 +2,7 @@ from pathlib import Path from functools import singledispatch -from jsonschema.exceptions import ValidationError +from asdf.exceptions import ValidationError from parfive import Results import asdf diff --git a/setup.cfg b/setup.cfg index a8a1b57c..c94b2eb9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,7 +22,7 @@ packages = find: include_package_data = True install_requires = appdirs>=1.4 - asdf>=2.9.2 + asdf>=2.15.1 asdf-astropy>=0.1.1 asdf-transform-schemas astropy>=5 @@ -35,7 +35,6 @@ install_requires = parfive[ftp]>=1.5 sunpy[net,asdf]>=4.0.7 setuptools>=59 - jsonschema>=3.2 aiohttp>=3.6 tqdm>=4.63 setup_requires = setuptools_scm From b0f890dfdd7ce3dfc5fc9ee05f9794898a1cf7e4 Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 10 Aug 2023 11:08:29 -0400 Subject: [PATCH 2/8] add changelog entry --- CHANGELOG.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index dabc4161..c7751e89 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,11 @@ +1.0.1 (unreleased) +================== + +Trivial/Internal Changes +------------------------ + +- Import `ValidationError` from `asdf.exceptions` and drop `jsonschema` as a dependency. (`#295 `_) + 1.0.0 (2023-08-09) ================== From 29026ef23bbeff157196adfb19c8417adb98d0b6 Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 10 Aug 2023 11:09:11 -0400 Subject: [PATCH 3/8] fix import order --- dkist/dataset/loader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dkist/dataset/loader.py b/dkist/dataset/loader.py index 441958c9..5e5700a1 100644 --- a/dkist/dataset/loader.py +++ b/dkist/dataset/loader.py @@ -2,10 +2,10 @@ from pathlib import Path from functools import singledispatch -from asdf.exceptions import ValidationError from parfive import Results import asdf +from asdf.exceptions import ValidationError @singledispatch From 4685cecf2b7800d1746d343363ed33bb8bae8c45 Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 10 Aug 2023 11:11:05 -0400 Subject: [PATCH 4/8] incraese minimum asdf-transform-schemas version --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index c94b2eb9..8e2dab76 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,7 +24,7 @@ install_requires = appdirs>=1.4 asdf>=2.15.1 asdf-astropy>=0.1.1 - asdf-transform-schemas + asdf-transform-schemas>=0.3 astropy>=5 dask[array]>=2021.8.0 globus-sdk>=3.0 From 8335518e926e1639a421b6ea492ea5d43c86161e Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 11 Aug 2023 08:38:31 -0400 Subject: [PATCH 5/8] add attempt to import ValidationError first try to import ValidationError from asdf.exceptions then fallback to importing from the top level asdf if this fails. --- dkist/dataset/loader.py | 5 ++++- setup.cfg | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dkist/dataset/loader.py b/dkist/dataset/loader.py index 5e5700a1..e6424a74 100644 --- a/dkist/dataset/loader.py +++ b/dkist/dataset/loader.py @@ -5,7 +5,10 @@ from parfive import Results import asdf -from asdf.exceptions import ValidationError +try: + from asdf.exceptions import ValidationError +except ImportError: + from asdf import ValidationError @singledispatch diff --git a/setup.cfg b/setup.cfg index 8e2dab76..d73adece 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,9 +22,9 @@ packages = find: include_package_data = True install_requires = appdirs>=1.4 - asdf>=2.15.1 + asdf>=2.9.2 asdf-astropy>=0.1.1 - asdf-transform-schemas>=0.3 + asdf-transform-schemas astropy>=5 dask[array]>=2021.8.0 globus-sdk>=3.0 From 447f54ccf8b7d7ce1ee5e10bc4596f08da7514cd Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 11 Aug 2023 08:45:57 -0400 Subject: [PATCH 6/8] sort imports --- dkist/dataset/loader.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dkist/dataset/loader.py b/dkist/dataset/loader.py index e6424a74..1a1dbaf2 100644 --- a/dkist/dataset/loader.py +++ b/dkist/dataset/loader.py @@ -5,6 +5,7 @@ from parfive import Results import asdf + try: from asdf.exceptions import ValidationError except ImportError: From a70bcc70f4517c84c215fe19d9b7c9cea143a8ea Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 12 Oct 2023 13:59:07 -0400 Subject: [PATCH 7/8] add changelog entry --- CHANGELOG.rst | 8 -------- changelog/295.bugfix.rst | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) create mode 100644 changelog/295.bugfix.rst diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c7751e89..dabc4161 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,11 +1,3 @@ -1.0.1 (unreleased) -================== - -Trivial/Internal Changes ------------------------- - -- Import `ValidationError` from `asdf.exceptions` and drop `jsonschema` as a dependency. (`#295 `_) - 1.0.0 (2023-08-09) ================== diff --git a/changelog/295.bugfix.rst b/changelog/295.bugfix.rst new file mode 100644 index 00000000..dcccac4d --- /dev/null +++ b/changelog/295.bugfix.rst @@ -0,0 +1 @@ +Import ValidationError from asdf, drop jsonschema as a dependency. From 22171f9650b2c7f6f68409c3b16e44365c732570 Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 12 Oct 2023 14:03:29 -0400 Subject: [PATCH 8/8] add comment about ValidationError import --- dkist/dataset/loader.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dkist/dataset/loader.py b/dkist/dataset/loader.py index 1a1dbaf2..4f2bd7e9 100644 --- a/dkist/dataset/loader.py +++ b/dkist/dataset/loader.py @@ -7,8 +7,10 @@ import asdf try: + # first try to import from asdf.exceptions for asdf 2.15+ from asdf.exceptions import ValidationError except ImportError: + # fall back to top level asdf for older versions of asdf from asdf import ValidationError