Merge pull request #280 from inbo/housekeeping

Fix documentation building in github actions

.github/workflows/pages.yml

@@ -1,7 +1,7 @@
 name: Build and Deploy documentation
 on:
   push:
-    branches: [master]
+    branches: [master, housekeeping]
   workflow_dispatch:
 jobs:
   build-and-deploy:
@@ -12,8 +12,14 @@ jobs:
 
       - name: get build deps
         run: |
+          sudo apt install pandoc
           pip install -r doc-requirements.txt
 
+      - name: build docs
+        run: |
+          pip install .
+          cd docs
+          make html
 
       - name: Deploy documentation
         uses: peaceiris/actions-gh-pages@v3

.github/workflows/tests-coverage.yml

@@ -29,6 +29,7 @@ jobs:
             coveralls --service=github
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_PARALLEL: true 
   linux-pip-tests:
     runs-on: ubuntu-latest
     strategy:
@@ -53,6 +54,18 @@ jobs:
       - name: Upload coverage
         run: |
           python -m pip install coveralls
-          coveralls --service=github
+          COVERALLS_PARALLEL=true coveralls --service=github
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  finish-coverage:
+    runs-on: ubuntu-latest
+    needs: 
+    - windows-conda-tests
+    - linux-pip-tests
+    steps:
+    - name: Coveralls finished
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.github_token }}
+        parallel-finished: true

doc-requirements.txt

@@ -1,6 +1,9 @@
-Sphinx
+Sphinx==4.3.2
 nbsphinx
 jupyter_client
 ipykernel
-sphinx_rtd_theme
+sphinx_rtd_theme==1.0.0
 matplotlib
+Pygments==2.11.2
+click==8.0.3
+pandoc==2.0.1

docs/advanced_usage.ipynb

@@ -262,9 +262,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "adjusted_ct.plot(7)\n",
@@ -281,11 +279,6 @@
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "niche",
-   "language": "python",
-   "name": "niche"
-  },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",

setup.py

@@ -32,11 +32,11 @@
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: MIT License',
-    "Programming Language :: Python :: 2",
-    'Programming Language :: Python :: 2.7',
-    'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
+    'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
     ],
     include_package_data=True,
     tests_require=['pytest'],