diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9d340a80..f80967e8 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,4 +4,4 @@ Before you submit a pull request, check that it meets these guidelines: 2. If the pull request adds functionality, the docs should be updated. Put your new functionality into a function with a docstring, and add the feature to the list in README.rst. -3. The pull request should work for Python 3.7, 3.8, and 3.9. +3. The pull request should work for Python 3.8, 3.9, 3.10 and 3.1. diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a3844540..8b21094c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: fail-fast: true matrix: os: ["windows-latest", "ubuntu-latest", "macos-latest"] - python-version: ["3.7", "3.8", "3.9"] + python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - name: Checkout source diff --git a/continuous_integration/environment-3.10.yml b/continuous_integration/environment-3.10.yml new file mode 100644 index 00000000..a4b3a8f1 --- /dev/null +++ b/continuous_integration/environment-3.10.yml @@ -0,0 +1,20 @@ +name: dask-image-testenv + +channels: + - conda-forge + +dependencies: + - python=3.10.* + - pip==23.0.1 + - wheel==0.38.4 + - coverage==7.2.1 + - flake8==6.0.0 + - pytest==7.2.2 + - pytest-cov==4.0.0 + - pytest-flake8==1.1.1 + - dask==2023.3.1 + - numpy==1.24.2 + - scipy==1.10.1 + - scikit-image==0.19.3 + - pims==0.6.1 + - slicerator==1.1.0 diff --git a/continuous_integration/environment-3.11.yml b/continuous_integration/environment-3.11.yml new file mode 100644 index 00000000..7f127dff --- /dev/null +++ b/continuous_integration/environment-3.11.yml @@ -0,0 +1,20 @@ +name: dask-image-testenv-py311 + +channels: + - conda-forge + +dependencies: + - python=3.11.* + - pip + - wheel + - coverage + - flake8 + - pytest + - pytest-cov + - pytest-flake8 + - dask + - numpy + - scipy + - scikit-image + - pims + - slicerator diff --git a/continuous_integration/environment-3.7.yml b/continuous_integration/environment-3.7.yml deleted file mode 100644 index 8f2db306..00000000 --- a/continuous_integration/environment-3.7.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: dask-image-testenv - -channels: - - conda-forge - -dependencies: - - python=3.7.* - - pip==22.0.3 - - wheel==0.37.1 - - coverage==6.3.1 - - flake8==4.0.1 - - pytest==7.0.0 - - pytest-cov==4.0.0 - - pytest-flake8==1.0.7 - - dask==2.8.1 - - numpy==1.21.5 - - scipy==1.7.3 - - scikit-image==0.19.1 - - pims==0.5 - - slicerator==1.0.0 diff --git a/tests/test_dask_image/test_ndfilters/test__threshold.py b/tests/test_dask_image/test_ndfilters/test__threshold.py index 47030398..12fa2681 100644 --- a/tests/test_dask_image/test_ndfilters/test__threshold.py +++ b/tests/test_dask_image/test_ndfilters/test__threshold.py @@ -100,7 +100,6 @@ def setup(self): [4, 5, 1, 0, 0]], dtype=int), chunks=(5, 5)) @pytest.mark.parametrize("method, block_size, error_type", [ - ('gaussian', np.nan, ValueError), ('median', np.nan, TypeError), ]) def test_nan_blocksize(self, method, block_size, error_type): diff --git a/tests/test_dask_image/test_ndmeasure/test_core.py b/tests/test_dask_image/test_ndmeasure/test_core.py index 7efe295e..ac5c467d 100644 --- a/tests/test_dask_image/test_ndmeasure/test_core.py +++ b/tests/test_dask_image/test_ndmeasure/test_core.py @@ -53,7 +53,7 @@ def test_measure_props_err(funcname): "datatype", [ int, float, - np.bool, + np.bool_, np.uint8, np.uint16, np.uint32, @@ -445,7 +445,7 @@ def test_labeled_comprehension_struct(shape, chunks, ind): ) d_lbls = da.from_array(lbls, chunks=d.chunks) - dtype = np.dtype([("val", np.float64), ("pos", np.int)]) + dtype = np.dtype([("val", np.float64), ("pos", int)]) default = np.array((np.nan, -1), dtype=dtype) def func_max(val):