[Git][debian-gis-team/pykdtree][upstream] New upstream version 1.3.11+ds
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Sat Feb 17 07:39:14 GMT 2024
Antonio Valentino pushed to branch upstream at Debian GIS Project / pykdtree
Commits:
f723cac3 by Antonio Valentino at 2024-02-17T07:25:36+00:00
New upstream version 1.3.11+ds
- - - - -
5 changed files:
- .github/dependabot.yml
- .github/workflows/deploy-wheels.yml
- CHANGELOG.md
- pykdtree/__init__.py
- setup.py
Changes:
=====================================
.github/dependabot.yml
=====================================
@@ -8,4 +8,4 @@ updates:
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
- interval: "weekly"
+ interval: "monthly"
=====================================
.github/workflows/deploy-wheels.yml
=====================================
@@ -21,7 +21,7 @@ jobs:
python -m build -s
- name: Upload sdist to build artifacts
- uses: actions/upload-artifact at v3
+ uses: actions/upload-artifact at v4
with:
name: sdist
path: dist/*.tar.gz
@@ -35,12 +35,16 @@ jobs:
include:
- os: windows-2019
cibw_archs: "AMD64 ARM64"
+ artifact_name: "win"
- os: macos-11
cibw_archs: "x86_64 arm64"
+ artifact_name: "mac"
- os: "ubuntu-20.04"
cibw_archs: "aarch64"
+ artifact_name: "ubuntu-aarch"
- os: "ubuntu-20.04"
cibw_archs: "x86_64"
+ artifact_name: "ubuntu-x86_64"
steps:
- uses: actions/checkout at v4
@@ -54,18 +58,21 @@ jobs:
platforms: all
- name: Build wheels
- uses: pypa/cibuildwheel at v2.16.2
+ uses: pypa/cibuildwheel at v2.16.5
env:
CIBW_SKIP: "cp36-* cp37-* cp38-* pp* *i686 *-musllinux_aarch64"
CIBW_ARCHS: "${{ matrix.cibw_archs }}"
CIBW_TEST_COMMAND: "pytest -v --pyargs pykdtree"
CIBW_TEST_REQUIRES: "pytest"
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"
- name: Upload wheel(s) as build artifacts
- uses: actions/upload-artifact at v3
+ uses: actions/upload-artifact at v4
with:
- name: wheels
+ name: wheels-${{ matrix.artifact_name }}
path: ./wheelhouse/*.whl
upload_pypi:
@@ -73,20 +80,35 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download sdist artifact
- uses: actions/download-artifact at v3
+ uses: actions/download-artifact at v4
with:
name: sdist
path: dist
- - name: Download wheels artifact
- uses: actions/download-artifact at v3
+ - name: Download wheels artifact - win
+ uses: actions/download-artifact at v4
with:
- name: wheels
+ name: wheels-win
+ path: dist
+ - name: Download wheels artifact - mac
+ uses: actions/download-artifact at v4
+ with:
+ name: wheels-mac
+ path: dist
+ - name: Download wheels artifact - ubuntu aarch
+ uses: actions/download-artifact at v4
+ with:
+ name: wheels-ubuntu-aarch
+ path: dist
+ - name: Download wheels artifact - ubuntu x86_64
+ uses: actions/download-artifact at v4
+ with:
+ name: wheels-ubuntu-x86_64
path: dist
- name: Publish package to PyPI
if: github.event.action == 'published'
- uses: pypa/gh-action-pypi-publish at v1.8.10
+ uses: pypa/gh-action-pypi-publish at v1.8.11
with:
user: ${{ secrets.pypi_username }}
password: ${{ secrets.pypi_password }}
- skip_existing: true
+ skip-existing: true
=====================================
CHANGELOG.md
=====================================
@@ -1,3 +1,21 @@
+## Version 1.3.11 (2024/02/15)
+
+### Issues Closed
+
+* [Issue 106](https://github.com/storpipfugl/pykdtree/issues/106) - Gotchas when installing on MacOS ([PR 107](https://github.com/storpipfugl/pykdtree/pull/107) by [@djhoese](https://github.com/djhoese))
+
+In this release 1 issue was closed.
+
+### Pull Requests Merged
+
+#### Features added
+
+* [PR 109](https://github.com/storpipfugl/pykdtree/pull/109) - Build wheels with numpy 2
+* [PR 107](https://github.com/storpipfugl/pykdtree/pull/107) - Add OpenMP warning when extension fails to import ([106](https://github.com/storpipfugl/pykdtree/issues/106))
+
+In this release 2 pull requests were closed.
+
+
## Version 1.3.10 (2023/11/29)
### Pull Requests Merged
=====================================
pykdtree/__init__.py
=====================================
@@ -0,0 +1,13 @@
+"""Simple wrapper around importing pykdtree for OpenMP use or not."""
+
+try:
+ from . import kdtree
+except ImportError as err:
+ raise ImportError(
+ "Pykdtree failed to import its C extension. This usually means it "
+ "was built with OpenMP (C-level parallelization library) support but "
+ "could not find it on your system. To enable better performance "
+ "OpenMP must be installed (ex. ``brew install omp`` on Mac with "
+ "HomeBrew). Otherwise, try installing Pykdtree from source (ex. "
+ "``pip install --no-binary pykdtree --force-install pykdtree``)."
+ ) from err
=====================================
setup.py
=====================================
@@ -20,8 +20,9 @@ import sys
import re
import numpy as np
-from Cython.Build import cythonize
-from setuptools import setup, Extension
+from Cython.Build import build_ext
+from Cython.Distutils import Extension
+from setuptools import setup
from setuptools.command.build_ext import build_ext
@@ -189,16 +190,18 @@ extensions = [
Extension('pykdtree.kdtree', sources=['pykdtree/kdtree.pyx', 'pykdtree/_kdtree_core.c'],
include_dirs=[np.get_include()],
define_macros=[("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")],
- compiler_directions={"language_level": "3"},
+ cython_directives={"language_level": "3"},
),
]
+
setup(
name='pykdtree',
- version='1.3.10',
+ version='1.3.11',
url="https://github.com/storpipfugl/pykdtree",
description='Fast kd-tree implementation with OpenMP-enabled queries',
long_description=readme,
+ long_description_content_type="text/x-rst",
author='Esben S. Nielsen',
author_email='storpipfugl at gmail.com',
packages=['pykdtree'],
@@ -206,7 +209,7 @@ setup(
install_requires=['numpy'],
tests_require=['pytest'],
zip_safe=False,
- ext_modules=cythonize(extensions),
+ ext_modules=extensions,
cmdclass={'build_ext': build_ext_subclass},
classifiers=[
'Development Status :: 5 - Production/Stable',
View it on GitLab: https://salsa.debian.org/debian-gis-team/pykdtree/-/commit/f723cac39de52a363fc9d5cffc4b16d88a019350
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/pykdtree/-/commit/f723cac39de52a363fc9d5cffc4b16d88a019350
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/20240217/b3425c57/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list