MAINT: removes old classifier URLs that are no longer being used (#155)

qiime2 · Jun 26, 2024 · cb47d40 · cb47d40
1 parent 2b8b701
commit cb47d40
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 30 deletions.
diff --git a/urls/_2024.py b/urls/_2024.py
@@ -283,18 +283,6 @@
 
     # 2024.5
 
-    # 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-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':
-        'https://qiime2-data.s3-us-west-2.amazonaws.com/2024.5/common/silva-138-99-seqs.qza',
-    '2024.5/common/silva-138-99-tax-515-806.qza':
-        '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',
@@ -506,24 +494,6 @@
 
     # 2024.10
 
-    # 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-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':
-        'https://qiime2-data.s3-us-west-2.amazonaws.com/2024.10/common/silva-138-99-seqs.qza',
-    '2024.10/common/silva-138-99-tax-515-806.qza':
-        '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,14 @@
 # flake8: noqa
 
 MAP_CLASSIFIERS = {
+    # sklearn 0.21.2
+
+    # SEPP reference databases
+    'classifiers/sklearn-0.21.2/sepp-ref-dbs/sepp-refs-gg-13-8.qza':
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/classifiers/sklearn-0.21.2/sepp-ref-dbs/sepp-refs-gg-13-8.qza',
+    'classifiers/sklearn-0.21.2/sepp-ref-dbs/sepp-refs-silva-128.qza':
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/classifiers/sklearn-0.21.2/sepp-ref-dbs/sepp-refs-silva-128.qza',
+
     # sklearn 0.24.1
 
     # Greengenes
@@ -25,6 +33,10 @@
 
     # sklearn 1.4.2
 
+    # Greengenes
+    'classifiers/sklearn-1.4.2/greengenes/gg-13-8-99-515-806-nb-classifier.qza':
+        'https://s3-us-west-2.amazonaws.com/qiime2-data/classifiers/sklearn-1.4.2/greengenes/gg-13-8-99-515-806-nb-classifier.qza',
+
     # 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',