Merge branch 'main' into fix_path_logic

calebweinreb · Apr 3, 2024 · fa80094 · fa80094
2 parents 570a97a + d3153e2
commit fa80094
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -17,6 +17,9 @@ conda create -n snub python=3.8
 conda activate snub
 pip install systems-neuro-browser
 ```
+
+**Note: Python version 3.8 is required for Linux. For Windows and MacOS, any version ≥3.8 should work.**
+
 To speed up selections, `pip install ncls`. To install optional developer dependencies, `pip install systems-neuro-browser[dev]`. The docs include more detailed [installation instructions](https://snub.readthedocs.io/en/latest/install.html).
 
 ## Getting Started

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -1,7 +1,7 @@
 SNUB (Systems Neuro Browser)
 ============================
 
-reStructuredText:
+
 .. image:: https://joss.theoj.org/papers/10.21105/joss.06187/status.svg
    :target: https://doi.org/10.21105/joss.06187
 

diff --git a/docs/source/install.rst b/docs/source/install.rst
@@ -2,13 +2,17 @@ Installation
 ============
 
 Install Conda
-----------------
+-------------
 
 Install `Anaconda <https://docs.anaconda.com/anaconda/install/index.html>`_ or `Miniconda <https://docs.conda.io/en/latest/miniconda.html>`_. Create and activate an environment called ``snub`` with python≥3.8::
 
    conda create -n snub python=3.8
    conda activate snub
 
+.. note::
+   Python version 3.8 is required for Linux. For Windows and MacOS, any version ≥3.8 should work.
+
+
 
 Install SNUB
 ------------

diff --git a/setup.cfg b/setup.cfg
@@ -12,7 +12,7 @@ classifiers =
 [options]
 packages = find:
 include_package_data = True
-python_requires = >=3.8, <3.9
+python_requires = >=3.8
 install_requires =
     PyQt5
     numpy
@@ -29,7 +29,8 @@ install_requires =
     ipykernel
     pyqtgraph
     networkx
-    opencv-python==4.1.2.30
+    opencv-python; python_version > '3.8'
+    opencv-python==4.1.2.30; python_version == '3.8'
     vidio>=0.0.3
     pynwb
     ndx-pose