[Git][debian-gis-team/pykdtree][master] 6 commits: New upstream version 1.3.5+ds
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Sat Jun 11 11:59:20 BST 2022
Antonio Valentino pushed to branch master at Debian GIS Project / pykdtree
Commits:
d701f52d by Antonio Valentino at 2022-06-11T10:40:59+00:00
New upstream version 1.3.5+ds
- - - - -
b5d17ac9 by Antonio Valentino at 2022-06-11T10:40:59+00:00
Update upstream source from tag 'upstream/1.3.5+ds'
Update to upstream version '1.3.5+ds'
with Debian dir f71893b82a2e20aac54dba9095a7b452a72a009d
- - - - -
b30d26b6 by Antonio Valentino at 2022-06-11T10:41:42+00:00
New upstream release
- - - - -
5bd198c9 by Antonio Valentino at 2022-06-11T10:49:57+00:00
Update build dependencies
- - - - -
d0e7b562 by Antonio Valentino at 2022-06-11T10:51:39+00:00
Update d/copyright
- - - - -
434301b1 by Antonio Valentino at 2022-06-11T10:54:53+00:00
Set distribution to unstable
- - - - -
15 changed files:
- .github/workflows/deploy-wheels.yml
- − .travis.yml
- README.rst
- + RELEASING.md
- − appveyor.yml
- − appveyor/install.ps1
- − appveyor/missing-headers.ps1
- − appveyor/run_with_compiler.cmd
- debian/changelog
- debian/control
- debian/copyright
- debian/tests/control
- debian/tests/python3
- scripts/build-manylinux-wheels.sh
- setup.py
Changes:
=====================================
.github/workflows/deploy-wheels.yml
=====================================
@@ -14,18 +14,18 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, macos-latest]
- python-version: [3.6, 3.7, 3.8, 3.9]
+ python-version: ["3.7", "3.8", "3.9", "3.10"]
include:
# Using pythons inside a docker image to provide all the Linux
# python-versions permutations.
- - name: manylinux 64-bit
+ - name: manylinux2010 64-bit
os: ubuntu-latest
python-version: 3.8
- docker-image: manylinux1_x86_64
- - name: manylinux 32-bit
+ docker-image: manylinux2010_x86_64
+ - name: manylinux2010 32-bit
os: ubuntu-latest
python-version: 3.8
- docker-image: manylinux1_i686
+ docker-image: manylinux2010_i686
steps:
- uses: actions/checkout at v2
@@ -35,7 +35,7 @@ jobs:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python at v1
with:
- python-version: ${{ matrix.python-version }}
+ python-version: "${{ matrix.python-version }}"
- name: Install dependencies
run: |
=====================================
.travis.yml deleted
=====================================
@@ -1,16 +0,0 @@
-language: python
-python:
-- '2.7'
-- '3.6'
-
-env:
-- USE_OMP=0
-- USE_OMP=1 OMP_NUM_THREADS=4
-
-before_install:
-- sudo apt-get install python-dev
-
-install:
-- python setup.py install
-
-script: python setup.py test
=====================================
README.rst
=====================================
@@ -1,7 +1,5 @@
-.. image:: https://travis-ci.org/storpipfugl/pykdtree.svg?branch=master
- :target: https://travis-ci.org/storpipfugl/pykdtree
-.. image:: https://ci.appveyor.com/api/projects/status/ubo92368ktt2d25g/branch/master
- :target: https://ci.appveyor.com/project/storpipfugl/pykdtree
+.. image:: https://github.com/storpipfugl/pykdtree/workflows/deploy-wheels/badge.svg?branch=master
+ :target: https://github.com/storpipfugl/pykdtree/actions?query=workflow%3A%22deploy-wheels%22
========
pykdtree
@@ -103,12 +101,12 @@ Note: mileage will vary with the dataset at hand and computer architecture.
Test
----
-Run the unit tests using nosetest
+Run the unit tests using pytest
.. code-block:: bash
$ cd <pykdtree_dir>
- $ python setup.py nosetests
+ $ pytest
Installing on AppVeyor
----------------------
@@ -135,6 +133,8 @@ turned off by adding the following to `appveyor.yml` in the
Changelog
---------
+v1.3.5 : Build Python 3.10 wheels and other CI updates
+
v1.3.4 : Fix Python 3.9 wheels not being built for linux
v1.3.3 : Add compatibility to python 3.9
=====================================
RELEASING.md
=====================================
@@ -0,0 +1,21 @@
+# Releasing pykdtree
+
+1. Add release information to README.rst
+2. Update version number in setup.py
+3. Commit changes
+4. Create a git annotated tag by running:
+
+ ```
+ git tag -a vX.Y.Z -m "Version X.Y.Z"
+ ```
+
+5. Push to github with:
+
+ ```
+ git push --follow-tags
+ ```
+
+6. Wait for tests/actions to pass on GitHub.
+7. Click "Draft a new release" at https://github.com/storpipfugl/pykdtree/releases.
+ Title it "Version X.Y.Z" and include the release notes for this version in the description.
+
=====================================
appveyor.yml deleted
=====================================
@@ -1,98 +0,0 @@
-environment:
- global:
- # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
- # /E:ON and /V:ON options are not enabled in the batch script intepreter
- # See: http://stackoverflow.com/a/13751649/163740
- CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_compiler.cmd"
- # Don't build with openmp because it isn't supported in appveyor's compilers
- USE_OMP: "0"
-
- matrix:
- - PYTHON: "C:\\Python27_32"
- PYTHON_VERSION: "2.7.8"
- PYTHON_ARCH: "32"
- MINICONDA_VERSION: "2"
-
- - PYTHON: "C:\\Python27_64"
- PYTHON_VERSION: "2.7.8"
- PYTHON_ARCH: "64"
- MINICONDA_VERSION: "2"
-
- - PYTHON: "C:\\Python36_32"
- PYTHON_VERSION: "3.6"
- PYTHON_ARCH: "32"
- MINICONDA_VERSION: "3"
- USE_OMP: "0"
-
- - PYTHON: "C:\\Python36_64"
- PYTHON_VERSION: "3.6"
- PYTHON_ARCH: "64"
- MINICONDA_VERSION: "3"
- USE_OMP: "0"
-
- - PYTHON: "C:\\Python36_32"
- PYTHON_VERSION: "3.6"
- PYTHON_ARCH: "32"
- MINICONDA_VERSION: "3"
- USE_OMP: "1"
- OMP_NUM_THREADS: "4"
-
- - PYTHON: "C:\\Python36_64"
- PYTHON_VERSION: "3.6"
- PYTHON_ARCH: "64"
- MINICONDA_VERSION: "3"
- USE_OMP: "1"
- OMP_NUM_THREADS: "4"
-
-install:
- - "git submodule update --init --recursive"
- - ECHO "Filesystem root:"
- - ps: "ls \"C:/\""
-
- - ECHO "Installed SDKs:"
- - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
-
- # install miniconda with the powershell script install.ps1
- - "powershell ./appveyor/install.ps1"
- # install missing headers that aren't included with MSVC 2008
- # https://github.com/omnia-md/conda-recipes/pull/524
- - "powershell ./appveyor/missing-headers.ps1"
-
- # Prepend newly installed Python to the PATH of this build (this cannot be
- # done from inside the powershell script as it would require to restart
- # the parent CMD process).
- - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-
- # Check that we have the expected version and architecture for Python
- - "python --version"
- - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-
- # Install the build dependencies of the project. If some dependencies contain
- # compiled extensions and are not provided as pre-built wheel packages,
- # pip will build them from source using the MSVC compiler matching the
- # target Python version and architecture
- - "conda update --yes conda"
- - "conda config --add channels conda-forge"
- - "conda create -q --yes -n test python=%PYTHON_VERSION% numpy nose"
- - "activate test"
- - "pip install coveralls"
- - "where python"
-
-build: false # Not a C# project, build stuff at the test step instead.
-
-test_script:
- # Build the compiled extension and run the project tests
- - "%CMD_IN_ENV% python setup.py test"
-
-after_test:
- # If tests are successful, create a whl package for the project.
- - "%CMD_IN_ENV% python setup.py bdist_wheel bdist_wininst"
- - ps: "ls dist"
-
-artifacts:
- # Archive the generated wheel package in the ci.appveyor.com build report.
- - path: dist\*
-
-#on_success:
-# - TODO: upload the content of dist/*.whl to a public wheelhouse
-#
=====================================
appveyor/install.ps1 deleted
=====================================
@@ -1,71 +0,0 @@
-# Sample script to install anaconda under windows
-# Authors: Stuart Mumford
-# Borrwed from: Olivier Grisel and Kyle Kastner
-# License: BSD 3 clause
-
-$MINICONDA_URL = "http://repo.continuum.io/miniconda/"
-
-function DownloadMiniconda ($miniconda_version, $platform_suffix) {
- $webclient = New-Object System.Net.WebClient
- $filename = "Miniconda" + $miniconda_version + "-latest" + "-Windows-" + $platform_suffix + ".exe"
-
- $url = $MINICONDA_URL + $filename
-
- $basedir = $pwd.Path + "\"
- $filepath = $basedir + $filename
- if (Test-Path $filename) {
- Write-Host "Reusing" $filepath
- return $filepath
- }
-
- # Download and retry up to 3 times in case of network transient errors.
- Write-Host "Downloading" $filename "from" $url
- $retry_attempts = 2
- for($i=0; $i -lt $retry_attempts; $i++){
- try {
- $webclient.DownloadFile($url, $filepath)
- break
- }
- Catch [Exception]{
- Start-Sleep 1
- }
- }
- if (Test-Path $filepath) {
- Write-Host "File saved at" $filepath
- } else {
- # Retry once to get the error message if any at the last try
- $webclient.DownloadFile($url, $filepath)
- }
- return $filepath
-}
-
-function InstallMiniconda ($miniconda_version, $architecture, $python_home) {
- Write-Host "Installing miniconda" $miniconda_version "for" $architecture "bit architecture to" $python_home
- if (Test-Path $python_home) {
- Write-Host $python_home "already exists, skipping."
- return $false
- }
- if ($architecture -eq "32") {
- $platform_suffix = "x86"
- } else {
- $platform_suffix = "x86_64"
- }
- $filepath = DownloadMiniconda $miniconda_version $platform_suffix
- Write-Host "Installing" $filepath "to" $python_home
- $args = "/InstallationType=AllUsers /S /AddToPath=1 /RegisterPython=1 /D=" + $python_home
- Write-Host $filepath $args
- Start-Process -FilePath $filepath -ArgumentList $args -Wait -Passthru
- #Start-Sleep -s 15
- if (Test-Path $python_home) {
- Write-Host "Miniconda $miniconda_version ($architecture) installation complete"
- } else {
- Write-Host "Failed to install Python in $python_home"
- Exit 1
- }
-}
-
-function main () {
- InstallMiniconda $env:MINICONDA_VERSION $env:PYTHON_ARCH $env:PYTHON
-}
-
-main
=====================================
appveyor/missing-headers.ps1 deleted
=====================================
@@ -1,53 +0,0 @@
-function InstallMissingHeaders () {
- # Visual Studio 2008 is missing stdint.h, but you can just download one
- # from the web.
- # http://stackoverflow.com/questions/126279/c99-stdint-h-header-and-ms-visual-studio
- $webclient = New-Object System.Net.WebClient
-
- $include_dirs = @("C:\Program Files\Microsoft SDKs\Windows\v7.0\Include",
- "C:\Program Files\Microsoft SDKs\Windows\v7.1\Include",
- "C:\Users\appveyor\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC\include",
- "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\include",
- "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include")
-
- Foreach ($include_dir in $include_dirs) {
- $urls = @(@("https://raw.githubusercontent.com/chemeris/msinttypes/master/stdint.h", "stdint.h"),
- @("https://raw.githubusercontent.com/chemeris/msinttypes/master/inttypes.h", "inttypes.h"))
-
- Foreach ($i in $urls) {
- $url = $i[0]
- $filename = $i[1]
-
- $filepath = "$include_dir\$filename"
- if (Test-Path $filepath) {
- Write-Host $filename "already exists in" $include_dir
- continue
- }
-
- Write-Host "Downloading remedial " $filename " from" $url "to" $filepath
- $retry_attempts = 2
- for($i=0; $i -lt $retry_attempts; $i++){
- try {
- $webclient.DownloadFile($url, $filepath)
- break
- }
- Catch [Exception]{
- Start-Sleep 1
- }
- }
-
- if (Test-Path $filepath) {
- Write-Host "File saved at" $filepath
- } else {
- # Retry once to get the error message if any at the last try
- $webclient.DownloadFile($url, $filepath)
- }
- }
- }
-}
-
-function main() {
- InstallMissingHeaders
-}
-
-main
=====================================
appveyor/run_with_compiler.cmd deleted
=====================================
@@ -1,60 +0,0 @@
-:: To build extensions for 64 bit Python 3, we need to configure environment
-:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
-::
-:: To build extensions for 64 bit Python 2, we need to configure environment
-:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
-::
-:: 32 bit builds do not require specific environment configurations.
-::
-:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
-:: cmd interpreter, at least for (SDK v7.0)
-::
-:: More details at:
-:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
-:: http://stackoverflow.com/a/13751649/163740
-::
-:: Author: Olivier Grisel
-:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
- at ECHO OFF
-
-SET COMMAND_TO_RUN=%*
-SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
-
-SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
-SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
-IF %MAJOR_PYTHON_VERSION% == "2" (
- SET WINDOWS_SDK_VERSION="v7.0"
- SET SET_SDK_64=Y
-) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
- SET WINDOWS_SDK_VERSION="v7.1"
- IF %MINOR_PYTHON_VERSION% LEQ 4 (
- SET SET_SDK_64=Y
- ) ELSE (
- SET SET_SDK_64=N
- )
-) ELSE (
- ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
- EXIT 1
-)
-
-IF "%PYTHON_ARCH%"=="64" (
- IF %SET_SDK_64% == Y (
- ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
- SET DISTUTILS_USE_SDK=1
- SET MSSdk=1
- "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
- "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
- ECHO Executing: %COMMAND_TO_RUN%
- call %COMMAND_TO_RUN% || EXIT 1
- ) ELSE (
- ECHO Using default MSVC build environment for 64 bit architecture
- ECHO Executing: %COMMAND_TO_RUN%
- call %COMMAND_TO_RUN% || EXIT 1
- )
- ) ELSE (
- ECHO Using default MSVC build environment for 32 bit architecture
- ECHO Executing: %COMMAND_TO_RUN%
- call %COMMAND_TO_RUN% || EXIT 1
-)
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+pykdtree (1.3.5+ds-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update dependencies in d/control and d/tests/control.
+ * Update d/tests/python3 to use pytest.
+ * Update d/copyright.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Sat, 11 Jun 2022 10:54:35 +0000
+
pykdtree (1.3.4+ds-2) unstable; urgency=medium
[ Bas Couwenberg ]
=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Build-Depends: debhelper-compat (= 12),
cython3,
python3-all-dev,
python3-mako,
- python3-nose,
+ python3-pytest,
python3-numpy,
python3-setuptools
Standards-Version: 4.6.0
=====================================
debian/copyright
=====================================
@@ -25,7 +25,7 @@ License: LGPL-3+
Public License can be found in "/usr/share/common-licenses/LGPL-3".
Files: debian/*
-Copyright: 2013-2015 Antonio Valentino <antonio.valentino at tiscali.it>
+Copyright: 2013-2022 Antonio Valentino <antonio.valentino at tiscali.it>
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
=====================================
debian/tests/control
=====================================
@@ -1,2 +1,2 @@
Tests: python3
-Depends: python3-pykdtree, python3-all, python3-nose
+Depends: python3-pykdtree, python3-all, python3-pytest
=====================================
debian/tests/python3
=====================================
@@ -8,5 +8,5 @@ cd "$AUTOPKGTEST_TMP"
for py in $PYS; do
echo "=== $py ==="
- $py -m nose -v pykdtree 2>&1
+ $py -m pytest -v pykdtree 2>&1
done
=====================================
scripts/build-manylinux-wheels.sh
=====================================
@@ -3,14 +3,14 @@ set -e -x
# This is to be run by Docker inside a Docker image.
# You can test it locally on a Linux machine by installing docker and running from this repo's root:
-# $ docker run -e PLAT=manylinux1_x86_64 -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/scripts/build-manylinux-wheels.sh
+# $ docker run -e PLAT=manylinux2010_x86_64 -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/scripts/build-manylinux-wheels.sh
# * The -e just defines an environment variable PLAT=[docker name] inside the
# docker - auditwheel can't detect the docker name automatically.
# * The -v gives a directory alias for passing files in and out of the docker
# (/io is arbitrary). E.g the `setup.py` script would be accessed in the
# docker via `/io/setup.py`.
-# * quay.io/pypa/manylinux1_x86_64 is the full docker image name. Docker
+# * quay.io/pypa/manylinux2010_x86_64 is the full docker image name. Docker
# downloads it automatically.
# * The last argument is a shell command that the Docker will execute.
# Filenames must be from the Docker's perspective.
@@ -25,12 +25,16 @@ mkdir -p /io/temp-wheels
find /io/temp-wheels/ -type f -delete
# Iterate through available pythons.
-for PYBIN in /opt/python/cp3[6789]*/bin; do
- "${PYBIN}/pip" install -q -U setuptools wheel nose --cache-dir /io/pip-cache
- # Run the following in root of this repo.
- (cd /io/ && USE_OMP=$USE_OMP "${PYBIN}/pip" install -q .)
- (cd /io/ && USE_OMP=$USE_OMP "${PYBIN}/python" setup.py nosetests)
- (cd /io/ && USE_OMP=$USE_OMP "${PYBIN}/python" setup.py -q bdist_wheel -d /io/temp-wheels)
+for PY in cp3{7,8,9,10}; do
+ for PYBIN in /opt/python/"${PY}"*/bin; do
+ "${PYBIN}/pip" install -q -U setuptools wheel pytest build --cache-dir /io/pip-cache
+ # Run the following in root of this repo.
+ pushd /io/
+ USE_OMP=$USE_OMP "${PYBIN}/pip" install -q .
+ USE_OMP=$USE_OMP "${PYBIN}/pytest" --pyargs pykdtree
+ USE_OMP=$USE_OMP "${PYBIN}/python" -m build -w -o /io/temp-wheels
+ popd
+ done
done
"$PYBIN/pip" install -q auditwheel
=====================================
setup.py
=====================================
@@ -94,19 +94,18 @@ with open('README.rst', 'r') as readme_file:
setup(
name='pykdtree',
- version='1.3.4',
+ version='1.3.5',
url="https://github.com/storpipfugl/pykdtree",
description='Fast kd-tree implementation with OpenMP-enabled queries',
long_description=readme,
author='Esben S. Nielsen',
author_email='storpipfugl at gmail.com',
packages=['pykdtree'],
- python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
+ python_requires='>=3.7',
install_requires=['numpy'],
setup_requires=['numpy'],
- tests_require=['nose'],
+ tests_require=['pytest'],
zip_safe=False,
- test_suite='nose.collector',
ext_modules=[Extension('pykdtree.kdtree',
['pykdtree/kdtree.c', 'pykdtree/_kdtree_core.c'])],
cmdclass={'build_ext': build_ext_subclass},
View it on GitLab: https://salsa.debian.org/debian-gis-team/pykdtree/-/compare/77e95ffc3b04878451b09d82ee2f5ecf94a9d032...434301b19e3c7e08a9a872f316652376b87d5a5b
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/pykdtree/-/compare/77e95ffc3b04878451b09d82ee2f5ecf94a9d032...434301b19e3c7e08a9a872f316652376b87d5a5b
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/20220611/8b245716/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list