From 300fc15c01a98c9c495c1d31ff7b0bb4abe848a8 Mon Sep 17 00:00:00 2001
From: karandesai-96 <karandesai_96@live.com>
Date: Sat, 12 Mar 2016 23:54:52 +0530
Subject: [PATCH] Reform the directory structure.

- Move w7_13d out of tests/data.
---
 tardis/tests/data/w7_13d/__init__.py                |   0
 tardis/tests/{data => w7_13d}/__init__.py           |   0
 .../tests/{data => }/w7_13d/expected_ndarrays.npz   | Bin
 .../tests/{data => }/w7_13d/expected_quantities.npz | Bin
 tardis/tests/{data => }/w7_13d/tardis_w7.yml        |   0
 .../{data => }/w7_13d/tardis_w7_13d_abundances.dat  |   0
 .../{data => }/w7_13d/tardis_w7_13d_densities.dat   |   0
 tardis/tests/{data => }/w7_13d/test_w7.py           |   6 +++---
 tardis/tests/{data => }/w7_13d/w7_collect.py        |   0
 9 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 tardis/tests/data/w7_13d/__init__.py
 rename tardis/tests/{data => w7_13d}/__init__.py (100%)
 rename tardis/tests/{data => }/w7_13d/expected_ndarrays.npz (100%)
 rename tardis/tests/{data => }/w7_13d/expected_quantities.npz (100%)
 rename tardis/tests/{data => }/w7_13d/tardis_w7.yml (100%)
 rename tardis/tests/{data => }/w7_13d/tardis_w7_13d_abundances.dat (100%)
 rename tardis/tests/{data => }/w7_13d/tardis_w7_13d_densities.dat (100%)
 rename tardis/tests/{data => }/w7_13d/test_w7.py (90%)
 rename tardis/tests/{data => }/w7_13d/w7_collect.py (100%)

diff --git a/tardis/tests/data/w7_13d/__init__.py b/tardis/tests/data/w7_13d/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tardis/tests/data/__init__.py b/tardis/tests/w7_13d/__init__.py
similarity index 100%
rename from tardis/tests/data/__init__.py
rename to tardis/tests/w7_13d/__init__.py
diff --git a/tardis/tests/data/w7_13d/expected_ndarrays.npz b/tardis/tests/w7_13d/expected_ndarrays.npz
similarity index 100%
rename from tardis/tests/data/w7_13d/expected_ndarrays.npz
rename to tardis/tests/w7_13d/expected_ndarrays.npz
diff --git a/tardis/tests/data/w7_13d/expected_quantities.npz b/tardis/tests/w7_13d/expected_quantities.npz
similarity index 100%
rename from tardis/tests/data/w7_13d/expected_quantities.npz
rename to tardis/tests/w7_13d/expected_quantities.npz
diff --git a/tardis/tests/data/w7_13d/tardis_w7.yml b/tardis/tests/w7_13d/tardis_w7.yml
similarity index 100%
rename from tardis/tests/data/w7_13d/tardis_w7.yml
rename to tardis/tests/w7_13d/tardis_w7.yml
diff --git a/tardis/tests/data/w7_13d/tardis_w7_13d_abundances.dat b/tardis/tests/w7_13d/tardis_w7_13d_abundances.dat
similarity index 100%
rename from tardis/tests/data/w7_13d/tardis_w7_13d_abundances.dat
rename to tardis/tests/w7_13d/tardis_w7_13d_abundances.dat
diff --git a/tardis/tests/data/w7_13d/tardis_w7_13d_densities.dat b/tardis/tests/w7_13d/tardis_w7_13d_densities.dat
similarity index 100%
rename from tardis/tests/data/w7_13d/tardis_w7_13d_densities.dat
rename to tardis/tests/w7_13d/tardis_w7_13d_densities.dat
diff --git a/tardis/tests/data/w7_13d/test_w7.py b/tardis/tests/w7_13d/test_w7.py
similarity index 90%
rename from tardis/tests/data/w7_13d/test_w7.py
rename to tardis/tests/w7_13d/test_w7.py
index c871d874fe1..e7478f132db 100644
--- a/tardis/tests/data/w7_13d/test_w7.py
+++ b/tardis/tests/w7_13d/test_w7.py
@@ -16,17 +16,17 @@ class TestW7:
     @classmethod
     @pytest.fixture(scope="class", autouse=True)
     def setup(self):
-        self.w7_config_filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'data/w7_13d/tardis_w7.yml')
+        self.w7_config_filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'tardis_w7.yml')
         self.atom_data_filepath = '/tmp/kurucz_chianti_cd23_H_He.h5'
         self.obtained_w7_radial1d_model = tardis.run_tardis(config=self.w7_config_filepath,
                                                             atom_data=self.atom_data_filepath)
 
         self.expected_w7_ndarrays = np.load(
-            os.path.join(os.path.dirname(os.path.realpath(__file__)), 'data/w7_13d/expected_ndarrays.npz')
+            os.path.join(os.path.dirname(os.path.realpath(__file__)), 'expected_ndarrays.npz')
         )
 
         self.expected_w7_astropy_quantities = np.load(
-            os.path.join(os.path.dirname(os.path.realpath(__file__)), 'data/w7_13d/expected_quantities.npz')
+            os.path.join(os.path.dirname(os.path.realpath(__file__)), 'expected_quantities.npz')
         )
 
     def test_j_estimators(self):
diff --git a/tardis/tests/data/w7_13d/w7_collect.py b/tardis/tests/w7_13d/w7_collect.py
similarity index 100%
rename from tardis/tests/data/w7_13d/w7_collect.py
rename to tardis/tests/w7_13d/w7_collect.py