Skip to content

Commit

Permalink
Merge branch 'develop' into docs/plugin_create
Browse files Browse the repository at this point in the history
  • Loading branch information
Czaki committed Dec 4, 2023
2 parents 79230b5 + fb4a266 commit c3280b4
Show file tree
Hide file tree
Showing 6 changed files with 155 additions and 175 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Expand Up @@ -123,7 +123,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
miniforge-variant: mambaforge
Expand Down
6 changes: 3 additions & 3 deletions package/PartSeg/common_gui/channel_control.py
Expand Up @@ -677,7 +677,7 @@ def paintEvent(self, a0: QPaintEvent) -> None:
painter.setPen(QColor("white"))
painter.setBrush(QColor("white"))
painter.drawRect(self.rect() - self.margin)
icon: QIcon = qta.icon("fa5s.lock")
icon: QIcon = qta.icon("fa5s.lock", color="black")
icon.paint(painter, self.rect() - self.margin * 2)
painter.restore()

Expand All @@ -701,7 +701,7 @@ def paintEvent(self, a0: QPaintEvent) -> None:
painter.setPen(QColor("white"))
painter.setBrush(QColor("white"))
painter.drawRect(self.rect() - self.margin)
icon: QIcon = qta.icon("mdi.blur")
icon: QIcon = qta.icon("mdi.blur", color="black")
icon.paint(painter, self.rect())
painter.restore()

Expand All @@ -721,6 +721,6 @@ def paintEvent(self, a0: QPaintEvent) -> None:
painter.setPen(QColor("white"))
painter.setBrush(QColor("white"))
painter.drawRect(self.rect() - self.margin)
icon: QIcon = qta.icon("mdi.chart-bell-curve-cumulative")
icon: QIcon = qta.icon("mdi.chart-bell-curve-cumulative", color="black")
icon.paint(painter, self.rect())
painter.restore()
84 changes: 39 additions & 45 deletions requirements/constraints_py3.10.txt
Expand Up @@ -23,34 +23,32 @@ attrs==23.1.0
# referencing
babel==2.13.1
# via sphinx
backcall==0.2.0
# via ipython
build==1.0.3
# via npe2
cachey==0.2.1
# via napari
certifi==2023.7.22
certifi==2023.11.17
# via
# napari
# requests
# sentry-sdk
charset-normalizer==3.3.1
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via
# dask
# typer
cloudpickle==3.0.0
# via dask
comm==0.1.4
comm==0.2.0
# via ipykernel
coverage==7.3.2
# via
# coverage
# pytest-cov
czifile==2019.7.2
# via PartSeg (setup.cfg)
dask==2023.10.1
dask==2023.12.0
# via
# dask
# napari
Expand All @@ -66,7 +64,7 @@ docutils==0.17.1
# via sphinx
et-xmlfile==1.1.0
# via openpyxl
exceptiongroup==1.1.3
exceptiongroup==1.2.0
# via
# ipython
# pytest
Expand All @@ -76,19 +74,19 @@ fonticon-fontawesome6==6.4.0
# via PartSeg (setup.cfg)
freetype-py==2.4.0
# via vispy
fsspec==2023.10.0
fsspec==2023.12.0
# via dask
h5py==3.10.0
# via PartSeg (setup.cfg)
heapdict==1.0.1
# via cachey
hsluv==5.0.4
# via vispy
idna==3.4
idna==3.6
# via requests
imagecodecs==2023.9.18
# via PartSeg (setup.cfg)
imageio==2.31.6
imageio==2.33.0
# via
# -r requirements/version_denylist.txt
# PartSeg (setup.cfg)
Expand All @@ -97,39 +95,37 @@ imageio==2.31.6
# scikit-image
imagesize==1.4.1
# via sphinx
importlib-metadata==6.8.0
importlib-metadata==7.0.0
# via dask
in-n-out==0.1.9
# via app-model
iniconfig==2.0.0
# via pytest
ipykernel==6.26.0
ipykernel==6.27.1
# via
# PartSeg (setup.cfg)
# napari-console
# qtconsole
ipython==8.16.1
ipython==8.18.1
# via
# PartSeg (setup.cfg)
# ipykernel
# napari-console
ipython-genutils==0.2.0
# via qtconsole
jedi==0.19.1
# via ipython
jinja2==3.1.2
# via
# numpydoc
# sphinx
jsonschema==4.19.1
jsonschema==4.20.0
# via napari
jsonschema-specifications==2023.7.1
jsonschema-specifications==2023.11.2
# via jsonschema
jupyter-client==8.5.0
jupyter-client==8.6.0
# via
# ipykernel
# qtconsole
jupyter-core==5.4.0
jupyter-core==5.5.0
# via
# ipykernel
# jupyter-client
Expand Down Expand Up @@ -188,7 +184,7 @@ npe2==0.7.3
# via
# -r requirements/version_denylist.txt
# napari
numpy==1.26.1
numpy==1.26.2
# via
# PartSeg (setup.cfg)
# czifile
Expand Down Expand Up @@ -228,7 +224,7 @@ packaging==23.2
# sphinx
# superqt
# vispy
pandas==2.1.2
pandas==2.1.3
# via
# PartSeg (setup.cfg)
# napari
Expand All @@ -240,32 +236,30 @@ partsegcore-compiled-backend==0.15.1
# via PartSeg (setup.cfg)
partsegdata==0.10.0
# via PartSeg (setup.cfg)
pexpect==4.8.0
# via ipython
pickleshare==0.7.5
pexpect==4.9.0
# via ipython
pillow==10.0.1
pillow==10.1.0
# via
# imageio
# napari
# scikit-image
pint==0.22
# via napari
platformdirs==3.11.0
platformdirs==4.0.0
# via
# jupyter-core
# pooch
pluggy==1.3.0
# via pytest
pooch==1.8.0
# via scikit-image
prompt-toolkit==3.0.39
prompt-toolkit==3.0.41
# via ipython
psutil==5.9.6
# via
# ipykernel
# napari
psygnal==0.9.4
psygnal==0.9.5
# via
# PartSeg (setup.cfg)
# app-model
Expand All @@ -285,7 +279,7 @@ pydantic==1.10.13
# app-model
# napari
# npe2
pygments==2.16.1
pygments==2.17.2
# via
# PartSeg (setup.cfg)
# ipython
Expand All @@ -294,7 +288,7 @@ pygments==2.16.1
# rich
# sphinx
# superqt
pyinstaller==6.1.0
pyinstaller==6.2.0
# via PartSeg (setup.cfg)
pyinstaller-hooks-contrib==2023.10
# via pyinstaller
Expand All @@ -314,9 +308,9 @@ pyqt5-sip==12.13.0
# via
# -r requirements/version_denylist.txt
# pyqt5
pyqt6==6.5.3
pyqt6==6.6.1
# via PartSeg (setup.cfg)
pyqt6-qt6==6.5.3
pyqt6-qt6==6.6.1
# via pyqt6
pyqt6-sip==13.6.0
# via pyqt6
Expand Down Expand Up @@ -364,7 +358,7 @@ pyzmq==25.1.1
# qtconsole
qtawesome==1.2.3
# via PartSeg (setup.cfg)
qtconsole==5.4.4
qtconsole==5.5.1
# via
# PartSeg (setup.cfg)
# napari-console
Expand All @@ -377,7 +371,7 @@ qtpy==2.4.1
# qtawesome
# qtconsole
# superqt
referencing==0.30.2
referencing==0.31.1
# via
# jsonschema
# jsonschema-specifications
Expand All @@ -387,22 +381,22 @@ requests==2.31.0
# pooch
# pyconify
# sphinx
rich==13.6.0
rich==13.7.0
# via npe2
rpds-py==0.10.6
rpds-py==0.13.2
# via
# jsonschema
# referencing
scikit-image==0.22.0
# via
# PartSeg (setup.cfg)
# napari
scipy==1.11.3
scipy==1.11.4
# via
# PartSeg (setup.cfg)
# napari
# scikit-image
sentry-sdk==1.32.0
sentry-sdk==1.38.0
# via
# -r requirements/version_denylist.txt
# PartSeg (setup.cfg)
Expand All @@ -413,7 +407,7 @@ shiboken6==6.6.0
# pyside6
# pyside6-addons
# pyside6-essentials
simpleitk==2.3.0
simpleitk==2.3.1
# via PartSeg (setup.cfg)
six==1.16.0
# via
Expand Down Expand Up @@ -468,15 +462,15 @@ toolz==0.12.0
# dask
# napari
# partd
tornado==6.3.3
tornado==6.4
# via
# ipykernel
# jupyter-client
tqdm==4.66.1
# via napari
traceback-with-variables==2.0.4
# via PartSeg (setup.cfg)
traitlets==5.12.0
traitlets==5.14.0
# via
# comm
# ipykernel
Expand All @@ -499,7 +493,7 @@ typing-extensions==4.8.0
# typer
tzdata==2023.3
# via pandas
urllib3==2.0.7
urllib3==2.1.0
# via
# requests
# sentry-sdk
Expand All @@ -508,9 +502,9 @@ vispy==0.12.2
# PartSeg (setup.cfg)
# napari
# napari-svg
wcwidth==0.2.8
wcwidth==0.2.12
# via prompt-toolkit
wrapt==1.15.0
wrapt==1.16.0
# via napari
xlrd==2.0.1
# via PartSeg (setup.cfg)
Expand All @@ -520,5 +514,5 @@ zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==68.2.2
setuptools==69.0.2
# via pyinstaller

0 comments on commit c3280b4

Please sign in to comment.