[Git][debian-gis-team/trollimage][master] 5 commits: New upstream version 1.23.2
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Sat Apr 20 09:34:28 BST 2024
Antonio Valentino pushed to branch master at Debian GIS Project / trollimage
Commits:
72429a16 by Antonio Valentino at 2024-04-20T08:16:10+00:00
New upstream version 1.23.2
- - - - -
1864dc34 by Antonio Valentino at 2024-04-20T08:16:12+00:00
Update upstream source from tag 'upstream/1.23.2'
Update to upstream version '1.23.2'
with Debian dir 23fbf70fbc5d3d64fe316b0473a9f171e9276c1e
- - - - -
245fbbbb by Antonio Valentino at 2024-04-20T08:16:54+00:00
New upstream release
- - - - -
129e4bc5 by Antonio Valentino at 2024-04-20T08:26:46+00:00
New 0002-Compatibility-with-numpy-2.patch
- - - - -
bec1353d by Antonio Valentino at 2024-04-20T08:26:54+00:00
Set distribution to unstable
- - - - -
9 changed files:
- .github/workflows/ci.yaml
- .github/workflows/deploy.yaml
- CHANGELOG.md
- debian/changelog
- + debian/patches/0002-Compatibility-with-numpy-2.patch
- debian/patches/series
- pyproject.toml
- trollimage/_colorspaces.pyx
- trollimage/version.py
Changes:
=====================================
.github/workflows/ci.yaml
=====================================
@@ -13,7 +13,7 @@ jobs:
python-version: ["3.9", "3.11", "3.12"]
experimental: [false]
include:
- - python-version: "3.11"
+ - python-version: "3.12"
os: "ubuntu-latest"
experimental: true
@@ -43,6 +43,8 @@ jobs:
if: matrix.experimental == true
shell: bash -l {0}
run: |
+ python -m pip install versioneer pkgconfig setuptools-scm; \
+ conda uninstall --force-remove -y numpy pandas xarray pyresample pykdtree; \
python -m pip install \
-f https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/ \
--trusted-host pypi.anaconda.org \
@@ -50,13 +52,16 @@ jobs:
numpy \
pandas; \
python -m pip install \
- --no-deps --upgrade \
+ --no-deps --upgrade --pre --no-build-isolation \
+ git+https://github.com/storpipfugl/pykdtree \
+ git+https://github.com/pytroll/pyresample \
git+https://github.com/dask/dask \
git+https://github.com/dask/distributed \
- git+https://github.com/Unidata/cftime \
- git+https://github.com/mapbox/rasterio \
+ git+https://github.com/rasterio/rasterio \
git+https://github.com/pydata/bottleneck \
+ git+https://github.com/zarr-developers/zarr \
git+https://github.com/pydata/xarray;
+ python -m pip install -e . --no-deps --no-build-isolation;
- name: Install trollimage
shell: bash -l {0}
=====================================
.github/workflows/deploy.yaml
=====================================
@@ -59,14 +59,11 @@ jobs:
platforms: all
- name: Build wheels
- uses: pypa/cibuildwheel at v2.16.5
+ uses: pypa/cibuildwheel at v2.17.0
env:
CIBW_SKIP: "cp36-* cp37-* cp38-* pp* *-manylinux_i686 *-musllinux_i686 *-musllinux_aarch64 *-win32"
CIBW_ARCHS: "${{ matrix.cibw_archs }}"
CIBW_TEST_SKIP: "*_arm64 *_universal2:arm64"
- # below only for building against unstable numpy
- CIBW_BUILD_FRONTEND: "pip; args: --no-build-isolation"
- CIBW_BEFORE_BUILD: "pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy cython setuptools versioneer"
- uses: actions/upload-artifact at v4
with:
@@ -104,14 +101,14 @@ jobs:
path: dist
- name: Publish package to Test PyPI
if: github.event.action != 'published' && github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
- uses: pypa/gh-action-pypi-publish at v1.8.11
+ uses: pypa/gh-action-pypi-publish at v1.8.14
with:
user: __token__
password: ${{ secrets.test_pypi_password }}
repository_url: https://test.pypi.org/legacy/
- name: Publish package to PyPI
if: github.event.action == 'published'
- uses: pypa/gh-action-pypi-publish at v1.8.11
+ uses: pypa/gh-action-pypi-publish at v1.8.14
with:
user: __token__
password: ${{ secrets.pypi_password }}
=====================================
CHANGELOG.md
=====================================
@@ -1,3 +1,14 @@
+## Version 1.23.2 (2024/04/15)
+
+### Pull Requests Merged
+
+#### Bugs fixed
+
+* [PR 168](https://github.com/pytroll/trollimage/pull/168) - Build against numpy 2.0rc1
+
+In this release 1 pull request was closed.
+
+
## Version 1.23.1 (2024/02/14)
### Pull Requests Merged
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+trollimage (1.23.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/patches:
+ - New 0002-Compatibility-with-numpy-2.patch.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Sat, 20 Apr 2024 08:20:57 +0000
+
trollimage (1.23.1-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/patches/0002-Compatibility-with-numpy-2.patch
=====================================
@@ -0,0 +1,29 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sat, 20 Apr 2024 08:18:45 +0000
+Subject: Compatibility with numpy < 2
+
+Forwarded: not-needed
+---
+ pyproject.toml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 9012fc2..2cc1158 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,7 +1,7 @@
+ [build-system]
+ requires = [
+ "wheel",
+- "numpy>=2.0.0rc1,<2.3",
++ "numpy>",
+ "setuptools>=42",
+ "versioneer",
+ "Cython>=3.0.0"
+@@ -27,4 +27,4 @@ filterwarnings = [
+ log_cli_level = "info"
+ testpaths = [
+ "trollimage/tests",
+-]
+\ No newline at end of file
++]
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
0001-No-display.patch
+0002-Compatibility-with-numpy-2.patch
=====================================
pyproject.toml
=====================================
@@ -1,8 +1,7 @@
[build-system]
requires = [
"wheel",
- 'numpy; python_full_version<"3.12.0rc1"',
- 'numpy>=1.26.0rc1; python_full_version>="3.12.0rc1"',
+ "numpy>=2.0.0rc1,<2.3",
"setuptools>=42",
"versioneer",
"Cython>=3.0.0"
=====================================
trollimage/_colorspaces.pyx
=====================================
@@ -18,7 +18,7 @@ np.import_array()
# bint npy_isnan(np.float32_t x) nogil
# Function pointer type to allow for generic high-level functions
-ctypedef void (*CONVERT_FUNC)(floating[:] comp1, floating[:] comp2, floating[:] comp3, floating[:, ::1] out) nogil
+ctypedef void (*CONVERT_FUNC)(floating[:] comp1, floating[:] comp2, floating[:] comp3, floating[:, ::1] out) noexcept nogil
cdef:
=====================================
trollimage/version.py
=====================================
@@ -26,9 +26,9 @@ def get_keywords():
# setup.py/versioneer.py will grep for the variable names, so they must
# each be defined on a line of their own. _version.py will just call
# get_keywords().
- git_refnames = " (HEAD -> main, tag: v1.23.1)"
- git_full = "5cc4171b3306816324a0e26b93adf8b94b176813"
- git_date = "2024-02-14 13:26:28 -0600"
+ git_refnames = " (HEAD -> main, tag: v1.23.2)"
+ git_full = "78c093c210159c7eea5e932e550952b3dabab5f2"
+ git_date = "2024-04-15 14:06:06 -0500"
keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
return keywords
View it on GitLab: https://salsa.debian.org/debian-gis-team/trollimage/-/compare/0005e3e937c4865879addec47567dd78592723cf...bec1353dd2ccdf5b6e76fe4f0df1cd2a8d5c8801
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/trollimage/-/compare/0005e3e937c4865879addec47567dd78592723cf...bec1353dd2ccdf5b6e76fe4f0df1cd2a8d5c8801
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240420/0775d79b/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list