Prepare for new release

stcorp · Jul 24, 2023 · 3904698 · 3904698
1 parent 97b49d9
commit 3904698
Show file tree

Hide file tree

Showing 44 changed files with 56 additions and 48 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",