From b0d388514e0c2db2074cc063017f361b0a41b254 Mon Sep 17 00:00:00 2001
From: Constantin Pape <constantin.pape@iwr.uni-heidelberg.de>
Date: Sun, 14 Jul 2019 23:30:00 +0200
Subject: [PATCH] Fix chromatin default table name
---
.../{base.csv => default.csv} | 0
.../{base.csv => default.csv} | 0
make_initial_version.py | 2 +-
test/attributes/test_morphology.py | 2 +-
4 files changed, 2 insertions(+), 2 deletions(-)
rename data/0.2.0/tables/sbem-6dpf-1-whole-segmented-chromatin-labels/{base.csv => default.csv} (100%)
rename data/0.2.1/tables/sbem-6dpf-1-whole-segmented-chromatin-labels/{base.csv => default.csv} (100%)
diff --git a/data/0.2.0/tables/sbem-6dpf-1-whole-segmented-chromatin-labels/base.csv b/data/0.2.0/tables/sbem-6dpf-1-whole-segmented-chromatin-labels/default.csv
similarity index 100%
rename from data/0.2.0/tables/sbem-6dpf-1-whole-segmented-chromatin-labels/base.csv
rename to data/0.2.0/tables/sbem-6dpf-1-whole-segmented-chromatin-labels/default.csv
diff --git a/data/0.2.1/tables/sbem-6dpf-1-whole-segmented-chromatin-labels/base.csv b/data/0.2.1/tables/sbem-6dpf-1-whole-segmented-chromatin-labels/default.csv
similarity index 100%
rename from data/0.2.1/tables/sbem-6dpf-1-whole-segmented-chromatin-labels/base.csv
rename to data/0.2.1/tables/sbem-6dpf-1-whole-segmented-chromatin-labels/default.csv
diff --git a/make_initial_version.py b/make_initial_version.py
index a1fefa5..2cc52f8 100755
--- a/make_initial_version.py
+++ b/make_initial_version.py
@@ -51,7 +51,7 @@ def make_sbem_tables(folder):
table_folder = os.path.join(folder, 'tables', tissue_name_out)
os.makedirs(table_folder, exist_ok=True)
tissue_table_in = os.path.join(old_folder, 'tables', 'em-segmented-tissue-labels.csv')
- tissue_table_out = os.path.join(table_folder, 'base.csv')
+ tissue_table_out = os.path.join(table_folder, 'default.csv')
copyfile(tissue_table_in, tissue_table_out)
diff --git a/test/attributes/test_morphology.py b/test/attributes/test_morphology.py
index 06d03be..1f105c5 100644
--- a/test/attributes/test_morphology.py
+++ b/test/attributes/test_morphology.py
@@ -11,7 +11,7 @@ sys.path.append('../..')
class TestMorphologyAttributes(unittest.TestCase):
tmp_folder = 'tmp_morpho'
- def _tearDown(self):
+ def tearDown(self):
try:
rmtree(self.tmp_folder)
except OSError:
--
GitLab