Prepares release 0.3.0

qbicsoftware · Sep 30, 2019 · 59dd353 · 59dd353
1 parent 6940ba0
commit 59dd353
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 
+## 0.3.0
+- Removes r channel
+- Requires bioconda and conda-forge as manadatory channels
+- Template has been adjusted to pass linting
+
 ## 0.1.1: Hotfix
 - Fix failing PyPi deployment
 

diff --git a/rmageddon/lint.py b/rmageddon/lint.py
@@ -184,7 +184,8 @@ def check_conda_environment(self):
         # Define the mandatory conda channels (min. requirement)
         mand_channel_settings = [
             'defaults',
-            'r'
+            'conda-forge',
+            'bioconda'
         ]
 
         # Check that the mandatory conda env declarations are there

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 import sys
 
-version = '0.2.2'
+version = '0.3.0'
 
 with open('README.md') as f:
     readme = f.read()

diff --git a/tests/lint_examples/awesome_working_example/environment.yml b/tests/lint_examples/awesome_working_example/environment.yml
@@ -1,7 +1,7 @@
 name: qtest000_1_ranalysis_123
 channels:
   - bioconda
-  - r
+  - conda-forge
   - defaults
 dependencies:
   - r-base=3.4.3

diff --git a/tests/lint_examples/minimal_working_example/environment.yml b/tests/lint_examples/minimal_working_example/environment.yml
@@ -1,7 +1,7 @@
 name: qtest000_1_ranalysis
 channels:
   - bioconda
-  - r
+  - conda-forge
   - defaults
 dependencies:
   - r-base=3.4.3