Skip to content

Commit

Permalink
Merge pull request #73 from clEsperanto/pyclesperanto-without-prototype
Browse files Browse the repository at this point in the history
WIP: transition from pyclesperanto_prototype to pyclesperanto
  • Loading branch information
haesleinhuepf authored Oct 18, 2024
2 parents b4b9e7b + 8542157 commit ecc2152
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 65 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9, '3.10']
python-version: [3.9, '3.10', 3.11]
platform: [ubuntu-latest] #, macos-latest] # windows-latest broken for now
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion napari_pyclesperanto_assistant/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
from ._convert_to_numpy import *
from ._napari_cle_functions import *

__version__ = "0.22.1"
__version__ = "0.23.0"
__common_alias__ = "ncle"
117 changes: 59 additions & 58 deletions napari_pyclesperanto_assistant/_napari_cle_functions.py

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ pyopencl
toolz
scikit-image
napari >=0.4.15
pyclesperanto-prototype >=0.22.0
pyclesperanto-prototype >=0.24.5
pyclesperanto==0.13.4
magicgui
numpy!=1.19.4
pyperclip
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def read(fname):
#use_scm = {"write_to": "napari_pyclesperanto_assistant/_version.py"}
setup(
name="napari_pyclesperanto_assistant",
version="0.22.1",
version="0.23.0",
author="Robert Haase, Talley Lambert",
author_email="[email protected]",
description="GPU-accelerated image processing in napari using OpenCL",
Expand All @@ -41,7 +41,7 @@ def read(fname):
url="https://github.com/clesperanto/napari_pyclesperanto_assistant",
packages=find_packages(),
include_package_data=True,
python_requires=">=3.6",
python_requires=">=3.9",
install_requires=requirements,
#use_scm_version=use_scm,
setup_requires=["setuptools_scm"],
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# For more information about tox, see https://tox.readthedocs.io/en/latest/
[tox]
envlist = py{38,39}-{linux}
envlist = py{39,310,311}-{linux}
#,macos,windows}

[gh-actions]
python =
3.8: py38
3.9: py39
3.10: py310
3.11: py311

[gh-actions:env]
PLATFORM =
Expand Down

0 comments on commit ecc2152

Please sign in to comment.