Update CI to reflect new organization.

Author: rossbar

.circleci/config.yml

@@ -17,7 +17,7 @@ jobs:
             python3 -m venv venv
             source venv/bin/activate
             pip install --upgrade pip wheel setuptools
-            pip install -r site/requirements.txt -r requirements.txt
+            pip install -r requirements.txt
 
       - restore_cache:
           keys:
@@ -32,18 +32,18 @@ jobs:
             source venv/bin/activate
             # n = nitpicky (broken links), W = warnings as errors,
             # T = full tracebacks, keep-going = run to completion even with errors
-            make -C site/ SPHINXOPTS="-nWT --keep-going" html
+            make SPHINXOPTS="-nWT --keep-going" html
 
       - save_cache:
           key: cache-data
           paths:
             - _data
 
       - store_artifacts:
-          path: site/_build/html
+          path: _build/html
 
       - persist_to_workspace:
-          root: site/_build
+          root: _build
           paths: html
 
   deploy-docs:
@@ -54,7 +54,7 @@ jobs:
       - checkout
 
       - attach_workspace:
-          at: site/_build
+          at: _build
 
       - run:
           name: install deploy deps
@@ -75,7 +75,7 @@ jobs:
       - run:
           name: deploy to gh-pages
           command: |
-            ghp-import -n -f -p -m "[skip ci] docs build of $CIRCLE_SHA1" site/_build/html
+            ghp-import -n -f -p -m "[skip ci] docs build of $CIRCLE_SHA1" _build/html
 
 
 workflows:

.github/workflows/conda.yml

@@ -38,12 +38,12 @@ jobs:
         run: |
           conda info
           conda list
-          make -C site/ SPHINXOPTS="-nWT --keep-going" html
+          make SPHINXOPTS="-nWT --keep-going" html
 
       - uses: actions/upload-artifact@v3
         with:
           name: sphinx-build-artifact
-          path: site/_build/html/reports
+          path: _build/html/reports
 
       - name: fail on build errors
         if: steps.build_step.outcome != 'success'

tox.ini

@@ -12,7 +12,6 @@ deps =
     # We use these files to specify all the dependencies, and below we override
     # versions for specific testing schenarios
     -rtest_requirements.txt
-    -rsite/requirements.txt
     -rrequirements.txt
 
     # TODO: add the oldest supported versions of all the dependencies here
@@ -33,7 +32,7 @@ commands =
     !buildhtml: bash -c 'find content -name "*.md" | grep -vf ignore_testing | xargs jupytext --to notebook '
 
     !buildhtml: pytest --nbval-lax --durations=10 content/
-    buildhtml: make -C site/ SPHINXOPTS="-nWT --keep-going" html
+    buildhtml: make -C SPHINXOPTS="-nWT --keep-going" html
 
 pip_pre =
     predeps: true