[cig-commits] [commit] master: Distutils/setuptools have a bug which has problems globbing for support files. Flattening the directory structure fixes this. (5160ce8)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/burnman

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/662f3b48414451d57acbf8ab74d8422c055d52a2...a84740600d8235a03743adbcc32c83d3305d8785

>---------------------------------------------------------------

commit 5160ce844010aadbcc665f6e6e1adf29e99f5696
Author: Ian Rose <ian.r.rose at gmail.com>
Date:   Sun Dec 14 19:52:36 2014 -0800

    Distutils/setuptools have a bug which has problems globbing for support files.  Flattening the directory structure fixes this.


>---------------------------------------------------------------

5160ce844010aadbcc665f6e6e1adf29e99f5696
 .../perplex_output => input_perplex}/fo50_HP2011_params.dat             | 0
 .../perplex_output => input_perplex}/fo_HP2011_params.dat               | 0
 .../perplex_output => input_perplex}/fo_SLB2011_params.dat              | 0
 .../HHPH2013_endmembers.dat                                             | 0
 .../HHPH2013data_to_burnman.py                                          | 0
 .../HPdata_to_burnman.py                                                | 0
 .../SLBdata_to_burnman.py                                               | 0
 .../slb_2011.txt                                                        | 0
 .../slb_2011_aliases.txt                                                | 0
 .../slb_2011_solutions.txt                                              | 0
 .../tc-ds62.txt                                                         | 0
 .../tc-ds62_solutions.txt                                               | 0
 misc/benchmarks/endmember_benchmarks.py                                 | 2 +-
 13 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/burnman/data/input_minphys/perplex_output/fo50_HP2011_params.dat b/burnman/data/input_perplex/fo50_HP2011_params.dat
similarity index 100%
rename from burnman/data/input_minphys/perplex_output/fo50_HP2011_params.dat
rename to burnman/data/input_perplex/fo50_HP2011_params.dat
diff --git a/burnman/data/input_minphys/perplex_output/fo_HP2011_params.dat b/burnman/data/input_perplex/fo_HP2011_params.dat
similarity index 100%
rename from burnman/data/input_minphys/perplex_output/fo_HP2011_params.dat
rename to burnman/data/input_perplex/fo_HP2011_params.dat
diff --git a/burnman/data/input_minphys/perplex_output/fo_SLB2011_params.dat b/burnman/data/input_perplex/fo_SLB2011_params.dat
similarity index 100%
rename from burnman/data/input_minphys/perplex_output/fo_SLB2011_params.dat
rename to burnman/data/input_perplex/fo_SLB2011_params.dat
diff --git a/burnman/data/raw_endmember_datasets/HHPH2013_endmembers.dat b/burnman/data/input_raw_endmember_datasets/HHPH2013_endmembers.dat
similarity index 100%
rename from burnman/data/raw_endmember_datasets/HHPH2013_endmembers.dat
rename to burnman/data/input_raw_endmember_datasets/HHPH2013_endmembers.dat
diff --git a/burnman/data/raw_endmember_datasets/HHPH2013data_to_burnman.py b/burnman/data/input_raw_endmember_datasets/HHPH2013data_to_burnman.py
similarity index 100%
rename from burnman/data/raw_endmember_datasets/HHPH2013data_to_burnman.py
rename to burnman/data/input_raw_endmember_datasets/HHPH2013data_to_burnman.py
diff --git a/burnman/data/raw_endmember_datasets/HPdata_to_burnman.py b/burnman/data/input_raw_endmember_datasets/HPdata_to_burnman.py
similarity index 100%
rename from burnman/data/raw_endmember_datasets/HPdata_to_burnman.py
rename to burnman/data/input_raw_endmember_datasets/HPdata_to_burnman.py
diff --git a/burnman/data/raw_endmember_datasets/SLBdata_to_burnman.py b/burnman/data/input_raw_endmember_datasets/SLBdata_to_burnman.py
similarity index 100%
rename from burnman/data/raw_endmember_datasets/SLBdata_to_burnman.py
rename to burnman/data/input_raw_endmember_datasets/SLBdata_to_burnman.py
diff --git a/burnman/data/raw_endmember_datasets/slb_2011.txt b/burnman/data/input_raw_endmember_datasets/slb_2011.txt
similarity index 100%
rename from burnman/data/raw_endmember_datasets/slb_2011.txt
rename to burnman/data/input_raw_endmember_datasets/slb_2011.txt
diff --git a/burnman/data/raw_endmember_datasets/slb_2011_aliases.txt b/burnman/data/input_raw_endmember_datasets/slb_2011_aliases.txt
similarity index 100%
rename from burnman/data/raw_endmember_datasets/slb_2011_aliases.txt
rename to burnman/data/input_raw_endmember_datasets/slb_2011_aliases.txt
diff --git a/burnman/data/raw_endmember_datasets/slb_2011_solutions.txt b/burnman/data/input_raw_endmember_datasets/slb_2011_solutions.txt
similarity index 100%
rename from burnman/data/raw_endmember_datasets/slb_2011_solutions.txt
rename to burnman/data/input_raw_endmember_datasets/slb_2011_solutions.txt
diff --git a/burnman/data/raw_endmember_datasets/tc-ds62.txt b/burnman/data/input_raw_endmember_datasets/tc-ds62.txt
similarity index 100%
rename from burnman/data/raw_endmember_datasets/tc-ds62.txt
rename to burnman/data/input_raw_endmember_datasets/tc-ds62.txt
diff --git a/burnman/data/raw_endmember_datasets/tc-ds62_solutions.txt b/burnman/data/input_raw_endmember_datasets/tc-ds62_solutions.txt
similarity index 100%
rename from burnman/data/raw_endmember_datasets/tc-ds62_solutions.txt
rename to burnman/data/input_raw_endmember_datasets/tc-ds62_solutions.txt
diff --git a/misc/benchmarks/endmember_benchmarks.py b/misc/benchmarks/endmember_benchmarks.py
index 1dbe402..4c29836 100644
--- a/misc/benchmarks/endmember_benchmarks.py
+++ b/misc/benchmarks/endmember_benchmarks.py
@@ -12,7 +12,7 @@ def p(v1, v2):
     return (v2-v1)/v1
 
 ###
-filemin=[['SLB2011', '../../burnman/data/input_minphys/perplex_output/fo_SLB2011_params.dat', SLB_2011.fo()],['HP2011', '../../burnman/data/input_minphys/perplex_output/fo_HP2011_params.dat', HP_2011_ds62.fo()]]
+filemin=[['SLB2011', '../../burnman/data/input_perplex/fo_SLB2011_params.dat', SLB_2011.fo()],['HP2011', '../../burnman/data/input_perplex/fo_HP2011_params.dat', HP_2011_ds62.fo()]]
 
 for database, f, mineral in filemin:
     f = open(f, 'r')