Merge pull request #62 from materialsproject/refactor

Massive refactoring to get ready for v1.0
materialsproject · Dec 28, 2019 · e8311c7 · e8311c7
2 parents da15282 + cb3e181
commit e8311c7
Show file tree

Hide file tree

Showing 56 changed files with 4,205 additions and 4,178 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,2 @@
+[run]
+omit = *test*
diff --git a/.gitignore b/.gitignore
@@ -110,3 +110,5 @@ ENV/
 
 .idea
 .DS_Store
+.vscode
+.pytest_cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 cache: pip
 python:
-  - "3.6"
+  - "3.7"
 install:
   - ./install-mpi.sh openmpi
   - pip install -r requirements.txt
@@ -28,16 +28,14 @@ before_script:
     --noauth --bind_ip_all --fork
   - cd -
 script:
-  - mpiexec -n 2  python $PWD/maggma/tests/mpi_test.py
-  - nosetests --nocapture --with-coverage --cover-package=maggma
+#  - mpiexec -n 2  python $PWD/maggma/tests/mpi_test.py
+  - pytest --cov=maggma
 after_success:
   - coveralls
 notifications:
   email:
     recipients:
-      - [email protected]
       - [email protected]
-      - [email protected]
     on_success: change
     on_failure: always
 deploy:

diff --git a/source/apidoc/index.rst → docs/apidoc/index.rst b/source/apidoc/index.rst → docs/apidoc/index.rst
diff --git a/source/conf.py → docs/conf.py b/source/conf.py → docs/conf.py
diff --git a/source/index.rst → docs/index.rst b/source/index.rst → docs/index.rst
diff --git a/source/usage/installation.rst → docs/usage/installation.rst b/source/usage/installation.rst → docs/usage/installation.rst
diff --git a/source/usage/introduction.rst → docs/usage/introduction.rst b/source/usage/introduction.rst → docs/usage/introduction.rst
diff --git a/source/usage/quickstart.rst → docs/usage/quickstart.rst b/source/usage/quickstart.rst → docs/usage/quickstart.rst
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,3 +110,5 @@ ENV/ @@
     .idea
     .DS_Store
+    .vscode
+    .pytest_cache