Merge pull request #187 from prjemian/51-interpret-Gn-lines

interpret #Gn lines
prjemian · Aug 14, 2019 · 54dea43 · 54dea43
2 parents 4b9e397 + 0f499e1
commit 54dea43
Show file tree

Hide file tree

Showing 14 changed files with 1,774 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ before_script:
   - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH=$HOME/miniconda/bin:$PATH
   - export PY_ENV=travis-$TRAVIS_PYTHON_VERSION
-  - conda create -y -n $PY_ENV python=$TRAVIS_PYTHON_VERSION numpy lxml MatPlotLib h5py six coverage docopt
+  - conda create -y -n $PY_ENV python=$TRAVIS_PYTHON_VERSION --file=requirements.txt
   - source activate $PY_ENV
   - which pip
   - which python

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -4,3 +4,4 @@ include src/spec2nexus/data/*
 include src/spec2nexus/plugins/*.xsd
 include versioneer.py
 include src/spec2nexus/_version.py
+include src/spec2nexus/diffractometer-geometries.dict
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,5 @@
+coverage
+docopt
 h5py
 lxml
 matplotlib

diff --git a/setup.py b/setup.py
@@ -50,6 +50,7 @@
             'data/Cd*',
             'plugins/*.xsd',
             'LICENSE.txt',
+            'diffractometer-geometries.dict',
             ],
          },
     classifiers      = package.__classifiers__,