Merge branch 'master' into develop

compbiocore · Sep 3, 2019 · f89161f · f89161f
2 parents 9b32cc5 + dc1aae6
commit f89161f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -3,6 +3,7 @@ site_author:      Andrew Leith
 repo_url:         https://github.com/compbiocore/refchef
 site_description: RefChef
 site_url: https://compbiocore.github.io/ #this is the main site!
+google_analytics: ['UA-115983496-2', 'compbiocore.github.io']
 
 theme:
   name: material

diff --git a/refchef/__init__.py b/refchef/__init__.py
@@ -2,7 +2,7 @@
 from dotenv import load_dotenv
 import oyaml as yaml
 
-__version__ = '0.0.6'
+__version__ = '1.0.0'
 
 # load dotenv in the base root
 APP_ROOT = os.path.join(os.path.dirname(__file__), '..')   # refers to application_top

diff --git a/tests/data/new_linux.yaml b/tests/data/new_linux.yaml
@@ -22,6 +22,7 @@ index_test1:
       - md5sum *.fa.gz > postdownload_checksums.md5
       - gunzip *.gz
       - md5sum *.fa.gz > final_checksums.md5
+      src: 8040b09f-3844-3c42-b765-1f6a32614895
     - component: bwa_index_2
       complete:
         status: false
@@ -30,3 +31,4 @@ index_test1:
       - md5sum *.fa.gz > postdownload_checksums.md5
       - gunzip *.gz
       - md5sum *.fa.gz > final_checksums.md5
+      src: 'web'
diff --git a/tests/data/new_osx.yaml b/tests/data/new_osx.yaml
@@ -22,6 +22,7 @@ index_test1:
       - md5sum *.fa.gz > postdownload_checksums.md5
       - gunzip *.gz
       - md5sum *.fa.gz > final_checksums.md5
+      src: 8040b09f-3844-3c42-b765-1f6a32614895
     - component: bwa_index_2
       complete:
         status: false
@@ -30,3 +31,4 @@ index_test1:
       - md5sum *.fa.gz > postdownload_checksums.md5
       - gunzip *.gz
       - md5sum *.fa.gz > final_checksums.md5
+      src: 'web'
diff --git a/tests/test_references.py b/tests/test_references.py
@@ -111,7 +111,7 @@ def test_index_ref_link(conf, master):
         file_name = 'new_linux.yaml'
     ori = os.path.join(conf.git_local, file_name)
     des = os.path.join(conf.git_local, master)
-    append_yaml(ori, des)
+    merge_yaml(des, ori)
 
     execute(conf, master)
     path_1 = os.path.join(conf.reference_dir, 'reference_test1', 'primary', 'bwa_index')

diff --git a/tests/test_table_utils.py b/tests/test_table_utils.py
@@ -23,11 +23,11 @@ def test_split_filter():
     assert t[1] == "2"
 
 def test_table_columns(menu): #takes the fixture created above as an argument.
-    assert menu.shape == (2,14)
+    assert menu.shape == (3,14)
 
 def test_filter(menu):
     filtered = filter_menu(menu, "organism", "mouse")
-    assert filtered.shape == (2,14)
+    assert filtered.shape == (3,14)
     for i in list(filtered["organism"]):
         assert i == "mouse"
 
@@ -40,7 +40,7 @@ def test_multiple_filter(menu):
     s2 = "organism:mouse,type:references"
 
     f1 = multiple_filter(menu, s1)
-    assert f1.shape == (2,14)
+    assert f1.shape == (3,14)
     for i in list(f1["organism"]):
         assert i == "mouse"