update qiime 2

qiita-spots · Jul 23, 2024 · a30f568 · a30f568
1 parent 262c10d
commit a30f568
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/qiita-ci.yml b/.github/workflows/qiita-ci.yml
@@ -104,9 +104,9 @@ jobs:
       - name: Install plugins
         shell: bash -l {0}
         run: |
-          wget https://data.qiime2.org/distro/core/qiime2-2022.11-py38-linux-conda.yml
-          conda env create --quiet -n qtp-biom --file qiime2-2022.11-py38-linux-conda.yml
-          rm qiime2-2022.11-py38-linux-conda.yml
+          https://data.qiime2.org/distro/amplicon/qiime2-amplicon-2024.5-py39-linux-conda.yml
+          conda env create --quiet -n qtp-biom --file qiime2-amplicon-2024.5-py39-linux-conda.yml
+          rm qiime2-amplicon-2024.5-py39-linux-conda.yml
           export QIITA_ROOTCA_CERT=`pwd`/qiita_core/support_files/ci_rootca.crt
           export QIITA_CONFIG_FP=`pwd`/qiita_core/support_files/config_test.cfg
           export REDBIOM_HOST="http://localhost:7379"

diff --git a/qiita_db/util.py b/qiita_db/util.py
@@ -2894,7 +2894,7 @@ def merge_rows(rows):
     df['MaxRSSRaw'] = df.MaxRSS.apply(lambda x: MaxRSS_helper(str(x)))
     df['ElapsedRawTime'] = df.ElapsedRaw.apply(
         lambda x: timedelta(seconds=float(x)))
-    df.replace({nan: None}, inplace=True)
+    df.replace({np.nan: None}, inplace=True)
 
     for index, row in df.iterrows():
         with qdb.sql_connection.TRN: