diff --git a/CHANGES b/CHANGES index 57e420a..11c282f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +6.1 2023-07-24 +~~~~~~~~~~~~~~ + * The S3 bucket prefix is now created as a 'directory object' so its existence can be explicitly checked. @@ -17,8 +20,13 @@ * Fixed issue where muninn-summary could not group by core.physical_name or core.archive_path. +* Fixed issue where muninn was incorrectly using subdirectories in the + temporary directory if the 'tempdir' archive configuration option was set. + * Fixed issue where archive.retrieve() and archive.export() were returning a - list if a single properties Struct was given as parameter. + list if a single properties Struct was given as parameter and + `use_enclosing_directory` was not set. Additionally, each entry for a + product where `use_enclosing_directory` _is_ set will now always be a list. 6.0.1 2022-11-17 ~~~~~~~~~~~~~~~~ diff --git a/LICENSE b/LICENSE index f16687f..0e769fd 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2014-2022 S[&]T, The Netherlands. +Copyright (C) 2014-2023 S[&]T, The Netherlands. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/docs/install.md b/docs/install.md index e4f18ec..ba7f095 100644 --- a/docs/install.md +++ b/docs/install.md @@ -45,14 +45,14 @@ often require super user privileges. Using pip: ``` -$ pip install muninn-6.0.1.tar.gz +$ pip install muninn-6.1.tar.gz ``` Using setup.py: ``` -$ tar xvfz muninn-6.0.1.tar.gz -$ cd muninn-6.0.1 +$ tar xvfz muninn-6.1.tar.gz +$ cd muninn-6.1 $ python setup.py install ``` diff --git a/muninn/__init__.py b/muninn/__init__.py index 9900a35..1f4abdf 100644 --- a/muninn/__init__.py +++ b/muninn/__init__.py @@ -1,11 +1,11 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function -__version__ = "6.0.1" -__copyright__ = "Copyright (C) 2014-2022 S[&]T, The Netherlands." +__version__ = "6.1" +__copyright__ = "Copyright (C) 2014-2023 S[&]T, The Netherlands." __all__ = ["Error", "InternalError", "Struct", "Archive", "open", "config_path"] diff --git a/muninn/archive.py b/muninn/archive.py index 43f3195..15def6f 100644 --- a/muninn/archive.py +++ b/muninn/archive.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/config.py b/muninn/config.py index d73783a..687767e 100644 --- a/muninn/config.py +++ b/muninn/config.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/core.py b/muninn/core.py index fe6a6d6..7ab1ea5 100644 --- a/muninn/core.py +++ b/muninn/core.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/database/__init__.py b/muninn/database/__init__.py index c54c5e5..650b00f 100644 --- a/muninn/database/__init__.py +++ b/muninn/database/__init__.py @@ -1,3 +1,3 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # diff --git a/muninn/database/blobgeometry.py b/muninn/database/blobgeometry.py index 41d9896..5d95ac7 100644 --- a/muninn/database/blobgeometry.py +++ b/muninn/database/blobgeometry.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/database/ewkb.py b/muninn/database/ewkb.py index a72eb47..dcc47f6 100644 --- a/muninn/database/ewkb.py +++ b/muninn/database/ewkb.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/database/postgresql.py b/muninn/database/postgresql.py index 9b12b5c..f4d4626 100644 --- a/muninn/database/postgresql.py +++ b/muninn/database/postgresql.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/database/sql.py b/muninn/database/sql.py index 195f8e2..8bb627c 100644 --- a/muninn/database/sql.py +++ b/muninn/database/sql.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/database/sqlite.py b/muninn/database/sqlite.py index dead87f..0fc0983 100644 --- a/muninn/database/sqlite.py +++ b/muninn/database/sqlite.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/enum.py b/muninn/enum.py index 20216d7..7041ac3 100644 --- a/muninn/enum.py +++ b/muninn/enum.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/exceptions.py b/muninn/exceptions.py index aca238f..ed70fe3 100644 --- a/muninn/exceptions.py +++ b/muninn/exceptions.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/extension.py b/muninn/extension.py index c745609..9b33759 100644 --- a/muninn/extension.py +++ b/muninn/extension.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/function.py b/muninn/function.py index b8abced..f5b1185 100644 --- a/muninn/function.py +++ b/muninn/function.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/geometry.py b/muninn/geometry.py index 7c8ae35..c1e8ebe 100644 --- a/muninn/geometry.py +++ b/muninn/geometry.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/language.py b/muninn/language.py index cbf6fdf..72e79e3 100644 --- a/muninn/language.py +++ b/muninn/language.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/remote.py b/muninn/remote.py index 69b1beb..05fbd4e 100644 --- a/muninn/remote.py +++ b/muninn/remote.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/schema.py b/muninn/schema.py index 795cf79..b6685d7 100644 --- a/muninn/schema.py +++ b/muninn/schema.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/struct.py b/muninn/struct.py index 87bce90..8bd758b 100644 --- a/muninn/struct.py +++ b/muninn/struct.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/__init__.py b/muninn/tools/__init__.py index c54c5e5..650b00f 100644 --- a/muninn/tools/__init__.py +++ b/muninn/tools/__init__.py @@ -1,3 +1,3 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # diff --git a/muninn/tools/attach.py b/muninn/tools/attach.py index 6eb937f..0ef0130 100644 --- a/muninn/tools/attach.py +++ b/muninn/tools/attach.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/destroy.py b/muninn/tools/destroy.py index 1af5d30..9d57b57 100644 --- a/muninn/tools/destroy.py +++ b/muninn/tools/destroy.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/export.py b/muninn/tools/export.py index ed0e293..3b3f914 100644 --- a/muninn/tools/export.py +++ b/muninn/tools/export.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/hash.py b/muninn/tools/hash.py index f5c1623..7ca7547 100644 --- a/muninn/tools/hash.py +++ b/muninn/tools/hash.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/info.py b/muninn/tools/info.py index 10d3d09..17161fb 100644 --- a/muninn/tools/info.py +++ b/muninn/tools/info.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/ingest.py b/muninn/tools/ingest.py index 5db0f87..fcb0051 100644 --- a/muninn/tools/ingest.py +++ b/muninn/tools/ingest.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/list_tags.py b/muninn/tools/list_tags.py index 8d15898..6711868 100644 --- a/muninn/tools/list_tags.py +++ b/muninn/tools/list_tags.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/prepare.py b/muninn/tools/prepare.py index 2199c6c..56561f0 100644 --- a/muninn/tools/prepare.py +++ b/muninn/tools/prepare.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/pull.py b/muninn/tools/pull.py index d75f0ce..27674e1 100644 --- a/muninn/tools/pull.py +++ b/muninn/tools/pull.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/remove.py b/muninn/tools/remove.py index 0eda76f..8f63f09 100644 --- a/muninn/tools/remove.py +++ b/muninn/tools/remove.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/retrieve.py b/muninn/tools/retrieve.py index 1860464..9633c11 100644 --- a/muninn/tools/retrieve.py +++ b/muninn/tools/retrieve.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/search.py b/muninn/tools/search.py index 31a4fe8..13aee3c 100644 --- a/muninn/tools/search.py +++ b/muninn/tools/search.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/strip.py b/muninn/tools/strip.py index d6220eb..ab56afc 100644 --- a/muninn/tools/strip.py +++ b/muninn/tools/strip.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/summary.py b/muninn/tools/summary.py index 91266eb..5674a13 100644 --- a/muninn/tools/summary.py +++ b/muninn/tools/summary.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/tag.py b/muninn/tools/tag.py index b9c0da7..f4438ba 100644 --- a/muninn/tools/tag.py +++ b/muninn/tools/tag.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/untag.py b/muninn/tools/untag.py index 8f4f538..6ab7cf2 100644 --- a/muninn/tools/untag.py +++ b/muninn/tools/untag.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/update.py b/muninn/tools/update.py index 4f6876f..f50220a 100644 --- a/muninn/tools/update.py +++ b/muninn/tools/update.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/tools/utils.py b/muninn/tools/utils.py index eb3d39f..234090e 100644 --- a/muninn/tools/utils.py +++ b/muninn/tools/utils.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/util.py b/muninn/util.py index c9f0969..3879e10 100644 --- a/muninn/util.py +++ b/muninn/util.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/muninn/visitor.py b/muninn/visitor.py index c101b92..6ade242 100644 --- a/muninn/visitor.py +++ b/muninn/visitor.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2022 S[&]T, The Netherlands. +# Copyright (C) 2014-2023 S[&]T, The Netherlands. # from __future__ import absolute_import, division, print_function diff --git a/setup.py b/setup.py index 4f496d6..e8689f6 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ setup( name="muninn", - version="6.0.1", + version="6.1", description="Data product catalogue and archive system", url="https://github.com/stcorp/muninn", author="S[&]T",