Merge pull request #143 from NIDAP-Community/dev

Removed tarballs, updated version number and Conda package name
NIDAP-Community · Jan 31, 2024 · 6787e97 · 6787e97
2 parents 0f85910 + f0e24ad
commit 6787e97
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/gitflow-R-action.yml b/.github/workflows/gitflow-R-action.yml
@@ -16,7 +16,7 @@ jobs:
       image_to_use: ghcr.io/nidap-community/dsp_ci_cd:latest
       package_name: "r-dspworkflow"
       r_version: "4.1.3"
-      artifact_rid_production: "ri.artifacts.main.repository.20ce29a2-3803-4eae-b325-8fe367d47d1e"
+      artifact_rid_production: "ri.artifacts.main.repository.32a4b1e5-fb24-41a2-a552-fa252206e981"
       artifact_rid_development: "ri.stemma.main.repository.2172e505-c98f-43d4-881a-47e170aadbe1"
     secrets:
       NIDAP_TOKEN_PRODUCTION: ${{ secrets.NIDAP_TOKEN_PRODUCTION }}

diff --git a/Conda_Recipe/meta.yaml b/Conda_Recipe/meta.yaml
@@ -4,7 +4,7 @@
 {% set native = 'm2w64-' if win else '' %}
 
 package:
-  name: r-dspworkflow-test
+  name: r-dspworkflow
   version: {{ version|replace("-", "_") }}
 
 channels:

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: DSPWorkflow
 Title: A Workflow for Analyzing Digital Spatial Profiling RNA Data
-Version: 0.1.0
+Version: 1.3.0
 Authors@R: c(person("Rui", "He", email = "[email protected]", role = "aut"), 
     person("Maggie", "Cam", email = "[email protected]", role = "aut", comment = c(ORCID = "0000-0001-8190-9766")), 
     person("Ned", "Cauley", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-8968-6621")), 

diff --git a/tests/testthat/fixtures/Human_Colon/downloaded/colon_dccs.tar.gz b/tests/testthat/fixtures/Human_Colon/downloaded/colon_dccs.tar.gz
diff --git a/tests/testthat/fixtures/Human_Colon_CPTR/downloaded/.keepfolder b/tests/testthat/fixtures/Human_Colon_CPTR/downloaded/.keepfolder
@@ -0,0 +1 @@
+#Placeholder file to keep an empty downloaded folder in the github repo
diff --git a/tests/testthat/fixtures/Human_Colon_CPTR/downloaded/colon_cptr_dccs.tar.gz b/tests/testthat/fixtures/Human_Colon_CPTR/downloaded/colon_cptr_dccs.tar.gz
diff --git a/tests/testthat/fixtures/Human_Kidney/downloaded/kidney_dccs.tar.gz b/tests/testthat/fixtures/Human_Kidney/downloaded/kidney_dccs.tar.gz
diff --git a/tests/testthat/fixtures/Human_NSCLC/downloaded/nsclc_dccs.tar.gz b/tests/testthat/fixtures/Human_NSCLC/downloaded/nsclc_dccs.tar.gz
diff --git a/tests/testthat/fixtures/Mouse_Thymus/downloaded/thymus_dccs.tar.gz b/tests/testthat/fixtures/Mouse_Thymus/downloaded/thymus_dccs.tar.gz