Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

py-pyproj: update to 3.7.0, add py313 subport, remove py38 subport #26557

Merged
merged 2 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/py-owslib/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ checksums rmd160 410ddc5bbd8c9732a24d32524b813e6abe49f26b \
sha256 2ed6540087445cc57d905138a590b6ae58624ec7661b5c1682ed4e3303bcd150 \
size 185317

python.versions 38 39 310 311 312
python.versions 39 310 311 312

if {${name} ne ${subport}} {
depends_lib-append port:py${python.version}-dateutil \
Expand Down
80 changes: 23 additions & 57 deletions python/py-pyproj/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ PortSystem 1.0
PortGroup python 1.0

name py-pyproj
version 3.6.1
version 3.7.0
categories-append devel
license MIT

python.versions 38 39 310 311 312
python.versions 39 310 311 312 313

maintainers {stromnov @stromnov} openmaintainer

Expand All @@ -19,74 +19,40 @@ long_description Pyrex wrapper to provide python interfaces to PROJ.4 \

homepage https://pyproj4.github.io/pyproj

checksums md5 09a67b757bc473b47fb2e247b9994228 \
rmd160 4cea140c609a5e74dfb0de338e321bd670320329 \
sha256 44aa7c704c2b7d8fb3d483bbf75af6cb2350d30a63b144279a09b75fead501bf \
size 225131
checksums md5 3fe1e8f2c5fc58fb37a845b352f7251c \
rmd160 3e5a2991bff1093aac101b276e0b00ff7c3e357e \
sha256 bf658f4aaf815d9d03c8121650b6f0b8067265c36e31bc6660b98ef144d81813 \
size 225577

if {${name} ne ${subport}} {

if {${python.version} == 38} {
version 3.4.1
revision 0
checksums rmd160 435bff015e741fb24e21eea50b55bb0514fc2ebb \
sha256 261eb29b1d55b1eb7f336127344d9b31284d950a9446d1e0d1c2411f7dd8e3ac \
size 217916

variant proj8 conflicts proj9 {
depends_lib-append port:proj8
configure.env-append PROJ_DIR=${prefix}/lib/proj8
build.env-append PROJ_DIR=${prefix}/lib/proj8
destroot.env-append PROJ_DIR=${prefix}/lib/proj8
post-patch {
reinplace "s|%%INTERNAL_DATADIR%%|${prefix}/lib/proj8/share/proj|" ${worksrcpath}/pyproj/datadir.py
}
}

variant proj9 conflicts proj8 {
depends_lib-append port:proj9
configure.env-append PROJ_DIR=${prefix}/lib/proj9
build.env-append PROJ_DIR=${prefix}/lib/proj9
destroot.env-append PROJ_DIR=${prefix}/lib/proj9
post-patch {
reinplace "s|%%INTERNAL_DATADIR%%|${prefix}/lib/proj9/share/proj|" ${worksrcpath}/pyproj/datadir.py
}
}
if {${python.version} == 39} {
version 3.6.1
revision 0
checksums md5 09a67b757bc473b47fb2e247b9994228 \
rmd160 4cea140c609a5e74dfb0de338e321bd670320329 \
sha256 44aa7c704c2b7d8fb3d483bbf75af6cb2350d30a63b144279a09b75fead501bf \
size 225131
}

if {![variant_isset proj8] && ![variant_isset proj9]} {
default_variants +proj9
}
depends_build-append port:py${python.version}-cython
depends_lib-append port:proj9 \
port:py${python.version}-certifi

patchfiles-append patch-pyproj_datadir.py.diff
} else {
depends_lib-append port:proj9
configure.env-append PROJ_DIR=${prefix}/lib/proj9
build.env-append PROJ_DIR=${prefix}/lib/proj9
destroot.env-append PROJ_DIR=${prefix}/lib/proj9
patchfiles-append patch-pyproj_datadir.py.diff
post-patch {
reinplace "s|%%INTERNAL_DATADIR%%|${prefix}/lib/proj9/share/proj|" ${worksrcpath}/pyproj/datadir.py
}
configure.env-append PROJ_DIR=${prefix}/lib/proj9
build.env-append PROJ_DIR=${prefix}/lib/proj9
destroot.env-append PROJ_DIR=${prefix}/lib/proj9
patchfiles-append patch-pyproj_datadir.py.diff
post-patch {
reinplace "s|%%INTERNAL_DATADIR%%|${prefix}/lib/proj9/share/proj|" ${worksrcpath}/pyproj/datadir.py
}

if {${python.version} <= 38} {
depends_build-append \
port:py${python.version}-cython-compat
set compat_path [string replace ${python.pkgd} 0 [string length ${python.prefix}]-1 ${prefix}/lib/py${python.version}-cython-compat]
build.env-append PYTHONPATH=${compat_path}
destroot.env-append PYTHONPATH=${compat_path}
} else {
depends_build-append \
port:py${python.version}-cython
}

if {[string match *gcc-4.* ${configure.compiler}]} {
# pycore_frame.h:134: error: ‘for’ loop initial declaration used outside C99 mode
build.cmd-prepend CFLAGS="-std=c99"
}

depends_lib-append port:py${python.version}-certifi

post-destroot {
xinstall -m 0644 -W ${worksrcpath} \
README.md PKG-INFO \
Expand Down
11 changes: 0 additions & 11 deletions python/py-pyproj/files/patch-pyproj_datadir.py.37.diff

This file was deleted.