Merge pull request #22 from materials-data-facility/forge-dev

Forge 0.5.1
materials-data-facility · Jan 9, 2018 · 889be4b · 889be4b
2 parents 5bbea73 + bab6f34
commit 889be4b
Show file tree

Hide file tree

Showing 15 changed files with 1,150 additions and 825 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,19 @@
 language: python
 python:
 - '2.7'
-- '3.3'
+#- '3.3'  # Bug in TravisCI prevents 3.3 tests running (old pip in path)
 - '3.4'
 - '3.5'
 - '3.6'
 install:
 - pip install -e .
-- pip install pytest pytest-cov coveralls
+- pip install pytest pytest-cov coveralls flake8
 env:
 - TEST_ENV=travis
 script:
-- travis_wait 50 py.test
+- flake8 . && travis_wait 50 py.test
 before_install:
-- openssl aes-256-cbc -K $encrypted_4b438100ad6f_key -iv $encrypted_4b438100ad6f_iv
+- openssl aes-256-cbc -K $encrypted_39a50b90a369_key -iv $encrypted_39a50b90a369_iv
   -in travis.tar.enc -out travis.tar -d
 - tar xvf travis.tar
 - mkdir -p ~/mdf/credentials/

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ r = mdf.search("materials commons")
 r_2 = mdf.search_by_elements(elements=["Al","Cu"], sources=["oqmd"])
 ```
 
-More examples are available in the examples directory.
+More examples are available in the docs/examples directory.
 
 
 # Documentation

diff --git a/examples/Example Aggregations.ipynb → docs/examples/Example Aggregations.ipynb b/examples/Example Aggregations.ipynb → docs/examples/Example Aggregations.ipynb
diff --git a/docs/examples/Example Analysis - Fe-Cr-Al Oxidation.ipynb b/docs/examples/Example Analysis - Fe-Cr-Al Oxidation.ipynb
diff --git a/...les/Example Machine Learning - OQMD.ipynb → ...les/Example Machine Learning - OQMD.ipynb b/...les/Example Machine Learning - OQMD.ipynb → ...les/Example Machine Learning - OQMD.ipynb
diff --git a/...s/Example Statistics - MDF Datasets.ipynb → ...s/Example Statistics - MDF Datasets.ipynb b/...s/Example Statistics - MDF Datasets.ipynb → ...s/Example Statistics - MDF Datasets.ipynb
diff --git a/examples/requirements.txt → docs/examples/requirements.txt b/examples/requirements.txt → docs/examples/requirements.txt