Merge pull request #72 from dihm/fix_docs_build

dihm · web-flow · commit 2a4db5af899d · 2022-08-05T17:07:41.000-04:00
Fix docs build
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -73,15 +73,15 @@
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3/', None),
     'numpy': ('https://numpy.org/doc/stable/', None),
-    'scipy': ('https://docs.scipy.org/doc/scipy/reference/', None),
+    'scipy': ('https://docs.scipy.org/doc/scipy/', None),
     'pandas': ('https://pandas.pydata.org/pandas-docs/stable/', None),
     'qtutils': ('https://qtutils.readthedocs.io/en/stable/', None),
     'pyqtgraph': (
         'https://pyqtgraph.readthedocs.io/en/latest/',
         None,
     ),  # change to stable once v0.11 is published
-    'matplotlib': ('https://matplotlib.org/', None),
-    'h5py': ('http://docs.h5py.org/en/stable/', None),
+    'matplotlib': ('https://matplotlib.org/stable/', None),
+    'h5py': ('https://docs.h5py.org/en/stable/', None),
     'pydaqmx': ('https://pythonhosted.org/PyDAQmx/', None),
     'qt': (
         '',
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,3 @@
 [build-system]
 requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=4.1.0"]
 build-backend = "setuptools.build_meta"
-
-[tool.setuptools_scm]
-version_scheme = "release-branch-semver"
-local_scheme = "node-and-date"
diff --git a/setup.cfg b/setup.cfg
@@ -42,7 +42,7 @@ spincore = spinapi
 nidaqmx = PyDAQmx
 nivision = PyNIVision
 docs = 
-  Sphinx==3.5.3
+  Sphinx==4.4.0
   sphinx-rtd-theme==0.5.2
   recommonmark==0.6.0
   m2r==0.2.1
diff --git a/setup.py b/setup.py
@@ -1,3 +1,9 @@
+import os
 from setuptools import setup
 
-setup()
+VERSION_SCHEME = {
+    "version_scheme": "release-branch-semver",
+    "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
+}
+
+setup(use_scm_version=VERSION_SCHEME)
