MAINT: moves classifiers to static (non-release) URLs (#152)

qiime2 · Jun 24, 2024 · 546f4a6 · 546f4a6
1 parent f1804bd
commit 546f4a6
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 33 deletions.
diff --git a/urls/_2024.py b/urls/_2024.py
@@ -264,24 +264,10 @@
         'https://raw.githubusercontent.com/qiime2/distributions/dev/2024.5/tiny/released/qiime2-tiny-ubuntu-latest-conda.yml',
 
     # 2024.5
-    '2024.5/common/2022.10.backbone.full-length.nb.sklearn-1.4.2.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.5/common/2022.10.backbone.full-length.nb.sklearn-1.4.2.qza',
-    '2024.5/common/2022.10.backbone.v4.nb.sklearn-1.4.2.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.5/common/2022.10.backbone.v4.nb.sklearn-1.4.2.qza',
-    '2024.5/common/gtdb_classifier_r220.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.5/common/gtdb_classifier_r220.qza',
-    '2024.5/common/gtdb_human_stool_weighted_classifier_r220.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.5/common/gtdb_human_stool_weighted_classifier_r220.qza',
-    '2024.5/common/gg-13-8-99-515-806-nb-classifier.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.5/common/gg-13-8-99-515-806-nb-classifier.qza',
-    '2024.5/common/sepp-refs-gg-13-8.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.5/common/sepp-refs-gg-13-8.qza',
+
+    # these are only used in the deprecated resources page
     '2024.5/common/sepp-refs-silva-128.qza':
         'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.5/common/sepp-refs-silva-128.qza',
-    '2024.5/common/silva-138-99-nb-classifier.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.5/common/silva-138-99-nb-classifier.qza',
-    '2024.5/common/silva-138-99-nb-human-stool-weighted-classifier.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.5/common/silva-138-99-nb-human-stool-weighted-classifier.qza',
     '2024.5/common/silva-138-99-seqs-515-806.qza':
         'https://qiime2-data.s3-us-west-2.amazonaws.com/2024.5/common/silva-138-99-seqs-515-806.qza',
     '2024.5/common/silva-138-99-seqs.qza':
@@ -290,6 +276,13 @@
         'https://qiime2-data.s3-us-west-2.amazonaws.com/2024.5/common/silva-138-99-tax-515-806.qza',
     '2024.5/common/silva-138-99-tax.qza':
         'https://qiime2-data.s3-us-west-2.amazonaws.com/2024.5/common/silva-138-99-tax.qza',
+
+    # these are used in tutorials
+    '2024.5/common/gg-13-8-99-515-806-nb-classifier.qza':
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.5/common/gg-13-8-99-515-806-nb-classifier.qza',
+    '2024.5/common/sepp-refs-gg-13-8.qza':
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.5/common/sepp-refs-gg-13-8.qza',
+
     '2024.5/tutorials/atacama-soils/10p/barcodes.fastq.gz':
         'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.5/tutorials/atacama-soils/10p/barcodes.fastq.gz',
     '2024.5/tutorials/atacama-soils/10p/forward.fastq.gz':
@@ -494,24 +487,10 @@
         'https://raw.githubusercontent.com/qiime2/distributions/dev/2024.10/tiny/released/qiime2-tiny-ubuntu-latest-conda.yml',
 
     # 2024.10
-    '2024.10/common/2022.10.backbone.full-length.nb.sklearn-1.4.2.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.10/common/2022.10.backbone.full-length.nb.sklearn-1.4.2.qza',
-    '2024.10/common/2022.10.backbone.v4.nb.sklearn-1.4.2.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.10/common/2022.10.backbone.v4.nb.sklearn-1.4.2.qza',
-    '2024.10/common/gtdb_classifier_r220.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.10/common/gtdb_classifier_r220.qza',
-    '2024.10/common/gtdb_human_stool_weighted_classifier_r220.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.10/common/gtdb_human_stool_weighted_classifier_r220.qza',
-    '2024.10/common/gg-13-8-99-515-806-nb-classifier.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.10/common/gg-13-8-99-515-806-nb-classifier.qza',
-    '2024.10/common/sepp-refs-gg-13-8.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.10/common/sepp-refs-gg-13-8.qza',
+
+    # these are only used in the deprecated resources page
     '2024.10/common/sepp-refs-silva-128.qza':
         'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.10/common/sepp-refs-silva-128.qza',
-    '2024.10/common/silva-138-99-nb-classifier.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.10/common/silva-138-99-nb-classifier.qza',
-    '2024.10/common/silva-138-99-nb-human-stool-weighted-classifier.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.10/common/silva-138-99-nb-human-stool-weighted-classifier.qza',
     '2024.10/common/silva-138-99-seqs-515-806.qza':
         'https://qiime2-data.s3-us-west-2.amazonaws.com/2024.10/common/silva-138-99-seqs-515-806.qza',
     '2024.10/common/silva-138-99-seqs.qza':
@@ -520,6 +499,13 @@
         'https://qiime2-data.s3-us-west-2.amazonaws.com/2024.10/common/silva-138-99-tax-515-806.qza',
     '2024.10/common/silva-138-99-tax.qza':
         'https://qiime2-data.s3-us-west-2.amazonaws.com/2024.10/common/silva-138-99-tax.qza',
+
+    # these are used in tutorials
+    '2024.10/common/gg-13-8-99-515-806-nb-classifier.qza':
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.10/common/gg-13-8-99-515-806-nb-classifier.qza',
+    '2024.10/common/sepp-refs-gg-13-8.qza':
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.10/common/sepp-refs-gg-13-8.qza',
+
     '2024.10/tutorials/atacama-soils/10p/barcodes.fastq.gz':
         'https://s3-us-west-2.amazonaws.com/qiime2-data/2024.10/tutorials/atacama-soils/10p/barcodes.fastq.gz',
     '2024.10/tutorials/atacama-soils/10p/forward.fastq.gz':

diff --git a/urls/_classifiers.py b/urls/_classifiers.py
@@ -9,6 +9,8 @@
 # flake8: noqa
 
 MAP_CLASSIFIERS = {
+    # sklearn 0.24.1
+
     # Greengenes
     'classifiers/greengenes/gg_12_10_otus.tar.gz':
         'https://s3-us-west-2.amazonaws.com/qiime2-data/classifiers/greengenes/gg_12_10_otus.tar.gz',
@@ -19,5 +21,23 @@
     'classifiers/greengenes/gg_2022_10_backbone_full_length.nb.qza':
         'https://s3-us-west-2.amazonaws.com/qiime2-data/classifiers/greengenes/gg_2022_10_backbone_full_length.nb.qza',
     'classifiers/greengenes/gg_2022_10_backbone.v4.nb.qza':
-        'https://s3-us-west-2.amazonaws.com/qiime2-data/classifiers/greengenes/gg_2022_10_backbone.v4.nb.qza'
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/classifiers/greengenes/gg_2022_10_backbone.v4.nb.qza',
+
+    # sklearn 1.4.2
+
+    # Greengenes 2
+    'classifiers/sklearn-1.4.2/greengenes2/2022.10.backbone.full-length.nb.sklearn-1.4.2.qza':
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/classifiers/sklearn-1.4.2/greengenes2/2022.10.backbone.full-length.nb.sklearn-1.4.2.qza',
+    'classifiers/sklearn-1.4.2/greengenes2/2022.10.backbone.v4.nb.sklearn-1.4.2.qza':
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/classifiers/sklearn-1.4.2/greengenes2/2022.10.backbone.v4.nb.sklearn-1.4.2.qza',
+    # GTDB
+    'classifiers/sklearn-1.4.2/gtdb/gtdb_classifier_r220.qza':
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/classifiers/sklearn-1.4.2/gtdb/gtdb_classifier_r220.qza',
+    'classifiers/sklearn-1.4.2/gtdb/gtdb_human_stool_weighted_classifier_r220.qza':
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/classifiers/sklearn-1.4.2/gtdb/gtdb_human_stool_weighted_classifier_r220.qza',
+    # Silva
+    'classifiers/sklearn-1.4.2/silva/silva-138-99-nb-classifier.qza':
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/classifiers/sklearn-1.4.2/silva/silva-138-99-nb-classifier.qza',
+    'classifiers/sklearn-1.4.2/silva/silva-138-99-nb-human-stool-weighted-classifier.qza':
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/classifiers/sklearn-1.4.2/silva/silva-138-99-nb-human-stool-weighted-classifier.qza',
 }