[Git][debian-gis-team/python-rtree][upstream] New upstream version 0.9.7

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / python-rtree


Commits:
5e025fb0 by Bas Couwenberg at 2020-12-25T06:45:21+01:00
New upstream version 0.9.7
- - - - -


3 changed files:

- .github/workflows/build.yml
- ci/install_libspatialindex.bat
- rtree/__init__.py


Changes:

=====================================
.github/workflows/build.yml
=====================================
@@ -1,9 +1,8 @@
 name: Build
 
 on:
+  push:
   pull_request:
-    branches:
-    - '*'
   release:
     types:
       - published
@@ -142,6 +141,8 @@ jobs:
         brew install coreutils
         pip install cmake
         bash ci/install_libspatialindex.bash
+    - uses: ilammy/msvc-dev-cmd at v1
+      if: startsWith(matrix.os, 'windows')
     - name: Run Windows Preinstall Build
       if: startsWith(matrix.os, 'windows')
       run: |


=====================================
ci/install_libspatialindex.bat
=====================================
@@ -1,23 +1,29 @@
 python -c "import sys; print(sys.version)"
 
-// A simple script to install libspatialindex from a Github Release
-curl -L -O https://github.com/libspatialindex/libspatialindex/archive/1.9.3.zip
+set SIDX_VERSION=1.9.3
 
-unzip 1.9.3.zip
-copy %~dp0\CMakeLists.txt libspatialindex-1.9.3\CMakeLists.txt
-cd libspatialindex-1.9.3
+curl -OL "https://github.com/libspatialindex/libspatialindex/archive/%SIDX_VERSION%.zip" 
+
+tar xvf "%SIDX_VERSION%.zip"
+
+REM unzip 1.9.3.zip
+REM copy %~dp0\CMakeLists.txt libspatialindex-1.9.3\CMakeLists.txt
+cd libspatialindex-%SIDX_VERSION%
 
 mkdir build
 cd build
 
-cmake -D CMAKE_BUILD_TYPE=Release ..
+pip install ninja
 
-"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\amd64\MSBuild.exe" spatialindex.sln
+cmake -D CMAKE_BUILD_TYPE=Release -G Ninja ..
+
+ninja
 
 mkdir %~dp0\..\rtree\lib
-copy bin\Debug\*.dll %~dp0\..\rtree\lib
+copy bin\*.dll %~dp0\..\rtree\lib
 rmdir /Q /S bin
 
 dir %~dp0\..\rtree\
 dir %~dp0\..\rtree\lib
 
+


=====================================
rtree/__init__.py
=====================================
@@ -4,6 +4,6 @@
 Rtree provides Python bindings to libspatialindex for quick
 hyperrectangular intersection queries.
 """
-__version__ = '0.9.6'
+__version__ = '0.9.7'
 
 from .index import Rtree, Index  # noqa



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-rtree/-/commit/5e025fb0029894a6d5270869ef15da5a1e61afa4

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-rtree/-/commit/5e025fb0029894a6d5270869ef15da5a1e61afa4
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/20201225/d33a6fff/attachment-0001.html>