Merge pull request #75 from mfisher87/pin-minimum-dep-versions

Drop support for Python 3.8, Qt5, matplotlib 3.4, scipy 1.7, numpy 1.21

Author: mfisher87

.github/workflows/test.yml

@@ -13,10 +13,9 @@ jobs:
           - "3.11"
           - "3.10"
           - "3.9"
-          - "3.8"
         pyqt-dependency:
-          - "PyQt5"
-            # - "PyQt6"
+          - "PyQt6"
+          - "PySide6"
 
     steps:
       - uses: "actions/checkout@v3"
@@ -37,8 +36,9 @@ jobs:
           # pytest-qt CI dependencies: https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions
           sudo apt update
           sudo apt install -y \
-            xvfb \
-            libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils
+            xvfb libegl1 \
+            libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils \
+            libxcb-cursor0
 
       - name: "Run tests"
         run: "make test"

Makefile

@@ -1,7 +1,7 @@
 .PHONY: test
 test:
 	python -m pytest --version
-	python -m pytest -v test/
+	python -m pytest -sv test/
 
 
 .PHONY: lint 

README.rst

@@ -3,16 +3,6 @@ viscm
 
 This is a little tool for analyzing colormaps and creating new colormaps.
 
-Try::
-
-  $ pip install viscm
-  $ python -m viscm view jet
-  $ python -m viscm edit
-
-There is some information available about how to interpret the
-resulting visualizations and use the editor tool `on this website
-<https://bids.github.io/colormap/>`_.
-
 Downloads:
   * https://pypi.python.org/pypi/viscm/
   * https://anaconda.org/conda-forge/viscm/
@@ -24,23 +14,50 @@ Contact:
   Nathaniel J. Smith <njs@pobox.com> and Stéfan van der Walt <stefanv@berkeley.edu>
 
 Dependencies:
-  * Python 3.8+
-  * `colorspacious <https://pypi.python.org/pypi/colorspacious>`_
-  * Matplotlib
-  * NumPy
+  * Python 3.9+
+  * `colorspacious <https://pypi.python.org/pypi/colorspacious>`_ 1.1+
+  * Matplotlib 3.5+
+  * NumPy 1.22+
+  * SciPy 1.8+
+  * one of PyQt6, PySide6
 
 License:
   MIT, see `LICENSE <LICENSE>`__ for details.
 
+
+Installation
+------------
+
+This is a GUI application, and requires Qt Python bindings.
+They can be provided by PyQt (GPL) or PySide (LGPL)::
+
+  $ pip install viscm[PySide]
+
+...or::
+
+  $ pip install viscm[PyQt]
+
+
+Usage
+-----
+
+::
+
+  $ viscm view jet
+  $ viscm edit
+
+There is some information available about how to interpret the
+resulting visualizations and use the editor tool `on this website
+<https://bids.github.io/colormap/>`_.
+
+
 Reproducing viridis
--------------------
+^^^^^^^^^^^^^^^^^^^
 
-Load [viridis AKA option_d.py](https://github.com/BIDS/colormap/) using:
+Load `viridis AKA option_d.py <https://github.com/BIDS/colormap/>`__ using::
 
-```
-python -m viscm --uniform-space buggy-CAM02-UCS -m Bezier edit /tmp/option_d.py
-```
+  viscm --uniform-space buggy-CAM02-UCS -m Bezier edit /tmp/option_d.py
 
 Note that there was a small bug in the assumed sRGB viewing conditions
 while designing viridis. It does not affect the outcome by much. Also
-see `python -m viscm --help`.
+see :code:`viscm --help`.

doc/contributing.md

@@ -22,6 +22,8 @@ python -m build
 pip install dist/*.whl  # or `dist/*.tar.gz`
 ```
 
+To automatically install a Qt dependency, try `pip install dist/<wheel_filename>[PyQt]`.
+
 
 ## Tests
 

environment.yml

@@ -9,6 +9,7 @@ dependencies:
   - "matplotlib ~=3.7"
   - "colorspacious ~=1.1"
   - "scipy ~=1.10"
+  - "PySide6"
 
   # Development
   - "mypy ~=1.3.0"

pyproject.toml

@@ -15,14 +15,19 @@ classifiers = [
   "Programming Language :: Python :: 3",
 ]
 
-requires-python = "~=3.8"
+requires-python = "~=3.9"
 dependencies = [
-  "numpy",
-  "matplotlib",
-  "colorspacious",
-  "scipy",
+  "numpy ~=1.22",
+  "matplotlib ~=3.5",
+  "colorspacious ~=1.1",
+  "scipy ~=1.8",
 ]
 
+[project.optional-dependencies]
+# Qt6 was released 2020.08.12
+PySide = ["PySide6"]
+PyQt = ["PyQt6"]
+
 [project.urls]
 repository = "https://github.com/matplotlib/viscm"
 # documentation = "https://viscm.readthedocs.io"
@@ -46,7 +51,7 @@ package-data = {viscm = ["examples/*"]}
 
 
 [tool.mypy]
-python_version = "3.8"
+python_version = "3.9"
 
 # These libraries don't have type stubs. Mypy will see them as `Any` and not
 # throw an [import] error.
@@ -62,10 +67,10 @@ ignore_missing_imports = true
 
 
 [tool.black]
-target-version = ["py38", "py39", "py310", "py311"]
+target-version = ["py39", "py310", "py311"]
 
 [tool.ruff]
-target-version = "py38"
+target-version = "py39"
 select = [
   "F",
   "E",

viscm/bezierbuilder/__init__.py

@@ -32,6 +32,8 @@
 from viscm.bezierbuilder.curve import curve_method
 from viscm.minimvc import Trigger
 
+Qt = QtCore.Qt
+
 
 class ControlPointModel:
     def __init__(self, xp, yp, fixed=None):
@@ -104,12 +106,14 @@ def on_button_press(self, event):
         if event.inaxes != self.ax:
             return
         res, ind = self.control_polygon.contains(event)
-        if res and modkey == QtCore.Qt.NoModifier:
+        if res and modkey == Qt.KeyboardModifier.NoModifier:
             self._index = ind["ind"][0]
-        if res and (modkey == QtCore.Qt.ControlModifier or self.mode == "remove"):
+        if res and (
+            modkey == Qt.KeyboardModifier.ControlModifier or self.mode == "remove"
+        ):
             # Control-click deletes
             self.control_point_model.remove_point(ind["ind"][0])
-        if modkey == QtCore.Qt.ShiftModifier or self.mode == "add":
+        if modkey == Qt.KeyboardModifier.ShiftModifier or self.mode == "add":
             # Adding a new point. Find the two closest points and insert it in
             # between them.
             total_squared_dists = []

viscm/cli.py

@@ -111,7 +111,7 @@ def cli():
 
     signal.signal(signal.SIGINT, signal.SIG_DFL)
 
-    app.exec_()
+    app.exec()
 
 
 def _make_window(
@@ -145,7 +145,7 @@ def _make_window(
             v.figure.savefig(str(save))
     elif action == "edit":
         if not cm.can_edit:
-            sys.exit("Sorry, I don't know how to edit the specified colormap")
+            raise RuntimeError("Sorry, I don't know how to edit the specified colormap")
 
         v = gui.viscm_editor(
             figure=fig,
@@ -164,7 +164,8 @@ def _make_window(
         sys.exit()
 
     figure_canvas.setSizePolicy(
-        gui.QtWidgets.QSizePolicy.Expanding, gui.QtWidgets.QSizePolicy.Expanding
+        gui.QtWidgets.QSizePolicy.Policy.Expanding,
+        gui.QtWidgets.QSizePolicy.Policy.Expanding,
     )
     figure_canvas.updateGeometry()