some more cleanup and extras stuff

DKISTDC · Apr 29, 2019 · bee2e68 · bee2e68
1 parent 92d607b
commit bee2e68
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -39,7 +39,7 @@ jobs:
       - run: *skip-check
       - run: *apt-install
       - run: *tox-install
-      - run: tox -e py37-offline
+      - run: tox -e py37
       - run: codecov
 
   tests-36:
@@ -50,7 +50,7 @@ jobs:
       - run: *skip-check
       - run: *apt-install
       - run: *tox-install
-      - run: tox -e py36-offline
+      - run: tox -e py36
       - run: codecov
 
   html-docs:

diff --git a/setup.cfg b/setup.cfg
@@ -39,8 +39,10 @@ docs =
   sphinx
   sphinx-astropy
   sphinx-gallery
+  pytest
 
 tests =
+  pytest
   pytest-cov
   pytest-astropy
   pytest-mock

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37}-offline, py37-build_docs
+envlist = py{36,37}, py37-build_docs
 
 [testenv]
 setenv = 
@@ -12,10 +12,9 @@ deps =
     git+https://github.com/Cadair/gwcs@dkist
     git+https://github.com/sunpy/sunpy
     git+https://github.com/sunpy/ndcube
-    build_docs: sphinx
-    build_docs: sphinx-astropy
-    build_docs: sphinx-gallery
-    build_docs: git+https://bitbucket.org/dkistdc/dkist-sphinx-theme.git
-commands =
-    offline: pytest --cov=./dkist
-    build_docs: sphinx-build docs docs/_build/html -W -b html
+commands = pytest --cov=./dkist
+
+[testenv:build_docs]
+basepython = python3.7
+extras = docs
+commands = sphinx-build docs docs/_build/html -W -b html