New Upstream Release - q2cli

Ready changes

Summary

Merged new upstream version: 2023.2.0 (was: 2022.11.1).

Diff

diff --git a/LICENSE b/LICENSE
index fbb55a5..eafc7a8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2016-2022, QIIME 2 development team.
+Copyright (c) 2016-2023, QIIME 2 development team.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/debian/changelog b/debian/changelog
index ed3834e..f719749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+q2cli (2023.2.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 14 Mar 2023 13:30:21 -0000
+
 q2cli (2022.11.1-2) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/bash-completion-with-hashbang.patch b/debian/patches/bash-completion-with-hashbang.patch
index eb5d992..69db8dc 100644
--- a/debian/patches/bash-completion-with-hashbang.patch
+++ b/debian/patches/bash-completion-with-hashbang.patch
@@ -4,8 +4,10 @@ Forwarded: not-needed
 Last-Update: 2020-12-02
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- q2cli.orig/bin/tab-qiime
-+++ q2cli/bin/tab-qiime
+Index: q2cli.git/bin/tab-qiime
+===================================================================
+--- q2cli.git.orig/bin/tab-qiime
++++ q2cli.git/bin/tab-qiime
 @@ -1,5 +1,3 @@
 -#!/usr/bin/env bash
 -
diff --git a/debian/patches/call_py3.patch b/debian/patches/call_py3.patch
index d8c6a34..487535b 100644
--- a/debian/patches/call_py3.patch
+++ b/debian/patches/call_py3.patch
@@ -1,8 +1,10 @@
 Description: call python3 in the tab-qiime script, as the package is python3 only
 From: Alex Mestiashvili <amestia@rsh2.donotuse.de>
---- q2cli.orig/bin/tab-qiime
-+++ q2cli/bin/tab-qiime
-@@ -13,7 +13,7 @@
+Index: q2cli.git/bin/tab-qiime
+===================================================================
+--- q2cli.git.orig/bin/tab-qiime
++++ q2cli.git/bin/tab-qiime
+@@ -13,7 +13,7 @@ _qiime_completion()
  {
    # Attempt to find the cached completion script. If q2cli isn't installed, or
    # is an incompatible version, don't attempt completion.
diff --git a/debian/patches/inform_zsh_users_howto_set_autocompletion.patch b/debian/patches/inform_zsh_users_howto_set_autocompletion.patch
index 96ff0bd..9cf61ad 100644
--- a/debian/patches/inform_zsh_users_howto_set_autocompletion.patch
+++ b/debian/patches/inform_zsh_users_howto_set_autocompletion.patch
@@ -3,10 +3,10 @@ Last-Update: Sat, 23 Mar 2019 14:43:01 +0100
 Description: Bash users will have a working completion, but we also need to
  inform zsh users how they can enable completion.
 
-Index: q2cli/q2cli/__main__.py
+Index: q2cli.git/q2cli/__main__.py
 ===================================================================
---- q2cli.orig/q2cli/__main__.py
-+++ q2cli/q2cli/__main__.py
+--- q2cli.git.orig/q2cli/__main__.py
++++ q2cli.git/q2cli/__main__.py
 @@ -17,18 +17,13 @@ QIIME 2 command-line interface (q2cli)
  
  To get help with QIIME 2, visit https://qiime2.org.
diff --git a/q2cli/__init__.py b/q2cli/__init__.py
index 5175e25..9c9bb0a 100644
--- a/q2cli/__init__.py
+++ b/q2cli/__init__.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/__main__.py b/q2cli/__main__.py
index 077f0a0..17c18c6 100644
--- a/q2cli/__main__.py
+++ b/q2cli/__main__.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/_version.py b/q2cli/_version.py
index a3ec125..3eb8ac1 100644
--- a/q2cli/_version.py
+++ b/q2cli/_version.py
@@ -23,9 +23,9 @@ def get_keywords():
     # setup.py/versioneer.py will grep for the variable names, so they must
     # each be defined on a line of their own. _version.py will just call
     # get_keywords().
-    git_refnames = " (HEAD -> master, tag: 2022.11.1)"
-    git_full = "da2a37b63494b67a5bc7a8b9f5b226b5cfd1f921"
-    git_date = "2022-12-21 21:36:54 +0000"
+    git_refnames = " (tag: 2023.2.0)"
+    git_full = "a5ad6dcd69228fc615e5c43809d0c12a3d3316c7"
+    git_date = "2023-02-27 22:22:17 +0000"
     keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
     return keywords
 
diff --git a/q2cli/builtin/__init__.py b/q2cli/builtin/__init__.py
index 856ea5f..6b775ca 100644
--- a/q2cli/builtin/__init__.py
+++ b/q2cli/builtin/__init__.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/builtin/dev.py b/q2cli/builtin/dev.py
index e36e361..efb98a4 100644
--- a/q2cli/builtin/dev.py
+++ b/q2cli/builtin/dev.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/builtin/info.py b/q2cli/builtin/info.py
index f810067..f8c004c 100644
--- a/q2cli/builtin/info.py
+++ b/q2cli/builtin/info.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/builtin/tools.py b/q2cli/builtin/tools.py
index 3a8788e..d117154 100644
--- a/q2cli/builtin/tools.py
+++ b/q2cli/builtin/tools.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/click/__init__.py b/q2cli/click/__init__.py
index 856ea5f..6b775ca 100644
--- a/q2cli/click/__init__.py
+++ b/q2cli/click/__init__.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/click/command.py b/q2cli/click/command.py
index a84358f..04d3248 100644
--- a/q2cli/click/command.py
+++ b/q2cli/click/command.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/click/option.py b/q2cli/click/option.py
index 2398a46..2afd752 100644
--- a/q2cli/click/option.py
+++ b/q2cli/click/option.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/click/parser.py b/q2cli/click/parser.py
index c185528..af37c56 100644
--- a/q2cli/click/parser.py
+++ b/q2cli/click/parser.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/click/type.py b/q2cli/click/type.py
index 5858f82..bac82b4 100644
--- a/q2cli/click/type.py
+++ b/q2cli/click/type.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/commands.py b/q2cli/commands.py
index 674f156..33e0df5 100644
--- a/q2cli/commands.py
+++ b/q2cli/commands.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/core/__init__.py b/q2cli/core/__init__.py
index 856ea5f..6b775ca 100644
--- a/q2cli/core/__init__.py
+++ b/q2cli/core/__init__.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/core/cache.py b/q2cli/core/cache.py
index 72d3066..53e19bc 100644
--- a/q2cli/core/cache.py
+++ b/q2cli/core/cache.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/core/completion.py b/q2cli/core/completion.py
index 4d7e7a0..83b2f83 100644
--- a/q2cli/core/completion.py
+++ b/q2cli/core/completion.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/core/config.py b/q2cli/core/config.py
index b84a808..bf52f91 100644
--- a/q2cli/core/config.py
+++ b/q2cli/core/config.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/core/state.py b/q2cli/core/state.py
index 0d951d9..7fedd94 100644
--- a/q2cli/core/state.py
+++ b/q2cli/core/state.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/core/usage.py b/q2cli/core/usage.py
index afba104..8a8d122 100644
--- a/q2cli/core/usage.py
+++ b/q2cli/core/usage.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/tests/__init__.py b/q2cli/tests/__init__.py
index 856ea5f..6b775ca 100644
--- a/q2cli/tests/__init__.py
+++ b/q2cli/tests/__init__.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/tests/test_cache_cli.py b/q2cli/tests/test_cache_cli.py
index b4d4d3a..aace3a7 100644
--- a/q2cli/tests/test_cache_cli.py
+++ b/q2cli/tests/test_cache_cli.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/tests/test_cli.py b/q2cli/tests/test_cli.py
index d608e45..eb0d2a1 100644
--- a/q2cli/tests/test_cli.py
+++ b/q2cli/tests/test_cli.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/tests/test_core.py b/q2cli/tests/test_core.py
index c61a77e..bb37044 100644
--- a/q2cli/tests/test_core.py
+++ b/q2cli/tests/test_core.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/tests/test_dev.py b/q2cli/tests/test_dev.py
index 8d6aae3..68a17d8 100644
--- a/q2cli/tests/test_dev.py
+++ b/q2cli/tests/test_dev.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/tests/test_mystery_stew.py b/q2cli/tests/test_mystery_stew.py
index a3abbe6..85d2538 100644
--- a/q2cli/tests/test_mystery_stew.py
+++ b/q2cli/tests/test_mystery_stew.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/tests/test_tools.py b/q2cli/tests/test_tools.py
index 313bb1f..fbe649c 100644
--- a/q2cli/tests/test_tools.py
+++ b/q2cli/tests/test_tools.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/tests/test_usage.py b/q2cli/tests/test_usage.py
index 34d7c19..a362c4d 100644
--- a/q2cli/tests/test_usage.py
+++ b/q2cli/tests/test_usage.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/q2cli/util.py b/q2cli/util.py
index 3643b6e..67aa16e 100644
--- a/q2cli/util.py
+++ b/q2cli/util.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
diff --git a/setup.py b/setup.py
index ee9794f..4fda888 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #

More details

Full run details

Historical runs