diff --git a/CHANGELOG.md b/CHANGELOG.md index b4ed3b113..57675f86a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Qiita changelog +Version 2025.04 +--------------- + +Deployed on April 11th, 2025 + +* General improvements for automatic environment generation by @sjanssen2 (thank you!): [#3462](https://github.com/qiita-spots/qiita/pull/3462), [#3463](https://github.com/qiita-spots/qiita/pull/3463), [3464](https://github.com/qiita-spots/qiita/pull/3464), [#3465](https://github.com/qiita-spots/qiita/pull/3465). +* When ProcessingJob.resource_allocation_info fails, it will now be [set as the error for the job](https://github.com/qiita-spots/qiita/pull/3466). +* SPP: General updates and clean up: [#169](https://github.com/biocore/mg-scripts/pull/169), [#101](https://github.com/qiita-spots/qp-knight-lab-processing/pull/101). +* `Remove SynDNA plasmid, insert, & CP026085 reads` superseded `Remove SynDNA inserts & plasmid reads`; which now removes SynDNA plasmids, inserts, and CP026085 reads, in this order. + Version 2025.02 --------------- @@ -8,7 +18,7 @@ Deployed on February 24th, 2025 * Replaced os.rename for shutil.move in the code to fix [#3455](https://github.com/qiita-spots/qiita/issues/3455). * Via qp-spades, replaced the legacy `spades` command for `cloudSPAdes` for TellSeq. * `FASTA_preprocessed` within qtp-sequencing now allows for results to be named using their sample-name, extra from run-prefix. -* `Remove SynDNA inserts & plasmid reads` superseded `Remove SynDNA reads`, which now removes SynDna inserts and plasmids. +* `Remove SynDNA inserts & plasmid reads` superseded `Remove SynDNA reads`, which now removes SynDNA inserts and plasmids. * `update_resource_allocation_redis` now relies on using equations stored in the database vs. hardcoded; thank you @Gossty! * SPP: Updated prep-info file generation to identify and report filtered fastq files that could not be matched to a sample-id instead of silently ignoring them. * SPP: Removed legacy test code and example files for amplicon processing. Some other tests updated and repurposed. diff --git a/qiita_core/__init__.py b/qiita_core/__init__.py index 041d7f77c..02965cb48 100644 --- a/qiita_core/__init__.py +++ b/qiita_core/__init__.py @@ -6,4 +6,4 @@ # The full license is in the file LICENSE, distributed with this software. # ----------------------------------------------------------------------------- -__version__ = "2025.02" +__version__ = "2025.04" diff --git a/qiita_db/__init__.py b/qiita_db/__init__.py index 3d4a06d0d..a4794ceca 100644 --- a/qiita_db/__init__.py +++ b/qiita_db/__init__.py @@ -27,7 +27,7 @@ from . import user from . import processing_job -__version__ = "2025.02" +__version__ = "2025.04" __all__ = ["analysis", "artifact", "archive", "base", "commands", "environment_manager", "exceptions", "investigation", "logger", diff --git a/qiita_db/processing_job.py b/qiita_db/processing_job.py index c773ff927..74ea87025 100644 --- a/qiita_db/processing_job.py +++ b/qiita_db/processing_job.py @@ -1050,6 +1050,13 @@ def submit(self, parent_job_id=None, dependent_jobs_list=None): # be used to monitor the job's progress. resource_params = self.resource_allocation_info + try: + resource_params = self.resource_allocation_info + except qdb.exceptions.QiitaDBUnknownIDError as e: + # this propagates the error to the job and using str(e) + # should be fine as we just want the last calculation + # error + self._set_error(str(e)) # note that parent_job_id is being passed transparently from # submit declaration to the launcher. diff --git a/qiita_pet/__init__.py b/qiita_pet/__init__.py index 041d7f77c..02965cb48 100644 --- a/qiita_pet/__init__.py +++ b/qiita_pet/__init__.py @@ -6,4 +6,4 @@ # The full license is in the file LICENSE, distributed with this software. # ----------------------------------------------------------------------------- -__version__ = "2025.02" +__version__ = "2025.04" diff --git a/qiita_pet/handlers/api_proxy/__init__.py b/qiita_pet/handlers/api_proxy/__init__.py index 2455b6132..ed0583693 100644 --- a/qiita_pet/handlers/api_proxy/__init__.py +++ b/qiita_pet/handlers/api_proxy/__init__.py @@ -38,7 +38,7 @@ from .user import (user_jobs_get_req) from .util import check_access, check_fp -__version__ = "2025.02" +__version__ = "2025.04" __all__ = ['prep_template_summary_get_req', 'data_types_get_req', 'study_get_req', 'sample_template_filepaths_get_req', diff --git a/qiita_ware/__init__.py b/qiita_ware/__init__.py index 041d7f77c..02965cb48 100644 --- a/qiita_ware/__init__.py +++ b/qiita_ware/__init__.py @@ -6,4 +6,4 @@ # The full license is in the file LICENSE, distributed with this software. # ----------------------------------------------------------------------------- -__version__ = "2025.02" +__version__ = "2025.04" diff --git a/setup.py b/setup.py index b07df6e5f..fd933970e 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ from setuptools import setup from glob import glob -__version__ = "2025.02" +__version__ = "2025.04" classes = """