Open DRKWang opened 3 years ago
Description changed:
---
+++
@@ -26,5 +26,6 @@
- latest documentation: https://rtree.readthedocs.io/en/latest/
- `libspatialindex` library: https://libspatialindex.org/en/latest/
+In addition,
+CGAL also provides an implementation called "Intersecting Sequences of dD Iso-oriented Boxes" for the R tree, https://doc.cgal.org/latest/Box_intersection_d/index.html#Chapter_Intersecting_Sequences_of_dD_Iso-oriented_Boxes.
-
Branch: public/32000
The branch does not exist - did you push it?
Commit: a60179a
Branch pushed to git repo; I updated commit sha1. New commits:
This branch does not have your new files.
the .txt files - the file names should all be lowercase. See the files for the existing packages. You can see the names that we use by typing grep SYSTEM= tox.ini
We do not distinguish the various Debian variants (there should be no separate file for ubuntu, devuan, etc.)
First line of SPKG.rst
should have a brief description, see format for other packages
checksums.ini - please add a line upstream_url
as explained here https://doc.sagemath.org/html/en/developer/packaging.html#upstream-urls
build/pkgs/rtree/SPKG.rst is referring to "AABBTree", that's probably a copy-paste error
Branch pushed to git repo; I updated commit sha1. New commits:
c552a1e | build/pkgs/libspatialindex: Make it a normal package |
I've added full packaging as a normal package to libspatialindex because homebrew does not provide a package for it
Author: Binshuai Wang, Matthias Koeppe
The file build/pkgs/rtree/requirements.txt
needs to be removed because it makes the package a "pip package", so checksums.ini is being ignored
Does rtree use the executables mvrtree
from libspatialindex, or does it link to library? In the latter case, the spkg-configure.m4 should be changed to use AC_LINK_IFELSE
. You can see a usage example in build/pkgs/ntl/spkg-configure.m4
Replying to @mkoeppe:
I've added full packaging as a normal package to libspatialindex because homebrew does not provide a package for it
I just found that homebrew provides a package for libspatialindex but it is in a different name: spatialindex, which is why I did not add it in
.distros
. You may check it from here https://repology.org/project/spatialindex/versions#homebrew
Branch pushed to git repo; I updated commit sha1. New commits:
791aafd | update SPKG.rst, correct distros, add url in checksums.ini, revise spkg-configure |
Replying to @mkoeppe:
The file
build/pkgs/rtree/requirements.txt
needs to be removed because it makes the package a "pip package", so checksums.ini is being ignored
I have deleted it.
Replying to @mkoeppe:
the .txt files - the file names should all be lowercase. See the files for the existing packages. You can see the names that we use by typing
grep SYSTEM= tox.ini
We do not distinguish the various Debian variants (there should be no separate file for ubuntu, devuan, etc.)First line of
SPKG.rst
should have a brief description, see format for other packages
The names of those files in .distros
have been changed following this format.
Replying to @mkoeppe:
checksums.ini - please add a line
upstream_url
as explained here https://doc.sagemath.org/html/en/developer/packaging.html#upstream-urls
A downloading link from github release has been added into checksums.ini.
Replying to @mkoeppe:
Does rtree use the executables
mvrtree
from libspatialindex, or does it link to library? In the latter case, the spkg-configure.m4 should be changed to useAC_LINK_IFELSE
. You can see a usage example inbuild/pkgs/ntl/spkg-configure.m4
The spkg-configure.m4 has been revised following reference.
Replying to @DRKWang:
Replying to @mkoeppe:
the .txt files - the file names should all be lowercase. See the files for the existing packages. You can see the names that we use by typing
grep SYSTEM= tox.ini
We do not distinguish the various Debian variants (there should be no separate file for ubuntu, devuan, etc.)First line of
SPKG.rst
should have a brief description, see format for other packagesThe names of those files in
.distros
have been changed following this format.
lowercase file names please. It matters on case-sensitive file systems...
Replying to @mkoeppe:
Replying to @DRKWang:
Replying to @mkoeppe:
the .txt files - the file names should all be lowercase. See the files for the existing packages. You can see the names that we use by typing
grep SYSTEM= tox.ini
We do not distinguish the various Debian variants (there should be no separate file for ubuntu, devuan, etc.)First line of
SPKG.rst
should have a brief description, see format for other packagesThe names of those files in
.distros
have been changed following this format.lowercase file names please. It matters on case-sensitive file systems...
The names of files have also been modified for lowercase. But I forgot to mention it.
Replying to @DRKWang:
lowercase file names please. It matters on case-sensitive file systems...
The names of files have also been modified for lowercase. But I forgot to mention it.
This change is not on the branch - please push it
Branch pushed to git repo; I updated commit sha1. New commits:
68735cb | temporarily rename the distributions files under package rtree and libspatialindex with adding prefix_ for later renaming those files with all lowercase, this is caused by git did not make case-sensitive. |
720ff79 | Rename the distribution files under package rtree and libspatialindex with lowercases. |
Replying to @mkoeppe:
Replying to @DRKWang:
lowercase file names please. It matters on case-sensitive file systems...
The names of files have also been modified for lowercase. But I forgot to mention it.
This change is not on the branch - please push it.
The lastest pushed branch has been changed for lowercase. Because the git is not case-sensitive, it still kept the same capital letters of those distribution files, even though I had changed them on my computer. After I realized the reason for that, I followed this solution https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git#1 and so that committed the code twice. Somehow, it is sort of not smart, but I did not figure out a better method for that.
Thanks for fixing this - that was a tricky one.
Replying to @mkoeppe:
Thanks for fixing this - that was a tricky one.
No problem, thanks for your encouragement.
Branch pushed to git repo; I updated commit sha1. New commits:
594bb26 | make a whole change for RealSet class with using 'self.__class__' and '@classmethod', as well as adding a new subclass RealSet_rtree. |
dfc5410 | Merge branch 'public/32000' of trac.sagemath.org:sage into realset_rtree |
674d982 | "Fixed 2 bugs: |
I just made a wrong commit, which is 674d982, for this ticket. Is there any way to retract it?
git reset --hard HEAD~
takes away the top commit on your branch.
Using git push --force
you can send the updated branch to the remote.
Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:
Replying to @mkoeppe:
git reset --hard HEAD~
takes away the top commit on your branch.Using
git push --force
you can send the updated branch to the remote.
I see. Thanks!
Docbuild fails
OSError: /sage/local/var/lib/sage/venv-python3.10.2/lib/python3.10/site-packages/sage/geometry/cone.py:docstring of sage.geometry.cone.ConvexRationalPolyhedralCone.polar:6: WARNING: Bullet list ends without a blank line; unexpected unindent.
actually #32170
Branch has merge conflicts
Rtree is a ctypes Python wrapper of libspatialindex that provides a number of advanced spatial indexing features for the spatially curious Python user. These features include:
Nearest neighbor search
Intersection search
Multi-dimensional indexes
Clustered indexes (store Python pickles directly with index entries)
Bulk loading
Deletion
Disk serialization
Custom storage implementation (to implement spatial indexing in ZODB, for example).
Although it is named as Rtree, it also provides options for its variants in terms of splitting. There are 3 ways for it, that is, linear, quadratic, and R* tree splitting. The difference of them can be found here https://en.wikipedia.org/wiki/R-tree.
We create a normal package for
Rtree
.libspatialindex
library: https://libspatialindex.org/en/latest/In addition, CGAL also provides an implementation called "Intersecting Sequences of dD Iso-oriented Boxes" for the R tree, https://doc.cgal.org/latest/Box_intersection_d/index.html#Chapter_Intersecting_Sequences_of_dD_Iso-oriented_Boxes.
CC: @mkoeppe
Component: packages: optional
Keywords: Rtree, spatial index
Author: Binshuai Wang, Matthias Koeppe
Branch/Commit: public/32000 @
dfc5410
Issue created by migration from https://trac.sagemath.org/ticket/32000