Merge pull request #977 from mjuric/main

Fixes around demo/config datafile distribution
dirac-institute · Jul 12, 2024 · 04d5d87 · 04d5d87
2 parents d472a6b + 1bb235c
commit 04d5d87
Show file tree

Hide file tree

Showing 15 changed files with 213 additions and 242 deletions.
diff --git a/demo/baseline_v2.0_1yr.db b/demo/baseline_v2.0_1yr.db
diff --git a/demo/baseline_v2.0_1yr.db b/demo/baseline_v2.0_1yr.db
@@ -0,0 +1 @@
+../src/sorcha/data/demo/baseline_v2.0_1yr.db
diff --git a/demo/quicktest.sh b/demo/quicktest.sh
diff --git a/demo/sorcha_config_demo.ini b/demo/sorcha_config_demo.ini
diff --git a/demo/sorcha_config_demo.ini b/demo/sorcha_config_demo.ini
@@ -0,0 +1 @@
+../src/sorcha/data/demo/sorcha_config_demo.ini
diff --git a/demo/sspp_testset_colours.txt b/demo/sspp_testset_colours.txt
diff --git a/demo/sspp_testset_colours.txt b/demo/sspp_testset_colours.txt
@@ -0,0 +1 @@
+../src/sorcha/data/demo/sspp_testset_colours.txt
diff --git a/demo/sspp_testset_orbits.des b/demo/sspp_testset_orbits.des
diff --git a/demo/sspp_testset_orbits.des b/demo/sspp_testset_orbits.des
@@ -0,0 +1 @@
+../src/sorcha/data/demo/sspp_testset_orbits.des
diff --git a/pyproject.toml b/pyproject.toml
@@ -107,9 +107,6 @@ sorcha_cmdline = "src/sorcha_cmdline"
 [tool.setuptools]
 zip-safe = false
 
-[tool.setuptools.package-data]
-sorcha = ["tests/data/*", "tests/data/*/*"]
-
 [tool.setuptools_scm]
 write_to = "src/sorcha/_version.py"
 

diff --git a/src/sorcha/data/demo/baseline_v2.0_1yr.db b/src/sorcha/data/demo/baseline_v2.0_1yr.db