Merge branch 'main' into main

WUST-FOG · Dec 15, 2022 · 678dcdb · 678dcdb
2 parents e573f05 + 5acac37
commit 678dcdb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,7 +9,7 @@ jobs:
       image: python:3.10
     steps:
       - name: Packages
-        run: pip install tox
+        run: pip install 'tox<4'
       - name: Checkout
         uses: actions/checkout@v3
       - name: Tox

diff --git a/docs/conf.py b/docs/conf.py
@@ -14,12 +14,19 @@
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.autosummary',
-	'numpydoc'
+    'numpydoc',
 ]
 
 autodoc_mock_imports = [
-    'numpy', 'matplotlib', 'matplotlib.pyplot', 'scipy', 'scipy.integrate',
-    'scipy.interpolate', 'pyfftw', 'hdf5storage', 'tqdm'
+    'hdf5storage',
+    'matplotlib',
+    'matplotlib.pyplot',
+    'numpy',
+    'pyfftw',
+    'scipy',
+    'scipy.integrate',
+    'scipy.interpolate',
+    'tqdm',
 ]
 
 autosummary_generate = True

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,4 +1,4 @@
 numpydoc
 sphinx_rtd_theme
 rinohtype
-pygments==2.5.1
+pygments>=2.5.1