Skip to content

geos: 3.11.2 -> 3.12.0#240229

Closed
willcohen wants to merge 1 commit intoNixOS:masterfrom
willcohen:geos-3.12
Closed

geos: 3.11.2 -> 3.12.0#240229
willcohen wants to merge 1 commit intoNixOS:masterfrom
willcohen:geos-3.12

Conversation

@willcohen
Copy link
Contributor

@willcohen willcohen commented Jun 28, 2023 •
edited
Loading

Description of changes

Updated from 3.11.2 to 3.12.0

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from imincik, nh2 and sikmir June 28, 2023 00:37
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Jun 28, 2023
@willcohen
Copy link
Contributor Author

willcohen commented Jun 28, 2023

Shapely appears broken during nixpkgs-review -- not yet sure if this is due to GEOS or a preexisting failure.

error: builder for '/nix/store/zxkldmrggbhlz0iicgbwnfq528iawi8c-python3.10-pygeos-0.14.drv' failed with exit code 1;
       last 10 log lines:
       > FAILED pygeos/tests/test_set_operations.py::test_coverage_union_non_polygon_inputs[geom_134-geom_234] - Failed: DID NOT RAISE <class 'pygeos.GEOSException'>
       > FAILED pygeos/tests/test_set_operations.py::test_coverage_union_non_polygon_inputs[geom_135-geom_235] - AssertionError: Regex pattern did not match.
       > FAILED pygeos/tests/test_set_operations.py::test_coverage_union_non_polygon_inputs[geom_136-geom_236] - AssertionError: Regex pattern did not match.
       > FAILED pygeos/tests/test_set_operations.py::test_coverage_union_non_polygon_inputs[geom_137-geom_237] - AssertionError: Regex pattern did not match.
       > FAILED pygeos/tests/test_set_operations.py::test_coverage_union_non_polygon_inputs[geom_138-geom_238] - AssertionError: Regex pattern did not match.
       > FAILED pygeos/tests/test_set_operations.py::test_coverage_union_non_polygon_inputs[geom_139-geom_239] - AssertionError: Regex pattern did not match.
       > FAILED pygeos/tests/test_set_operations.py::test_coverage_union_non_polygon_inputs[geom_140-geom_240] - AssertionError: Regex pattern did not match.
       > FAILED pygeos/tests/test_set_operations.py::test_coverage_union_non_polygon_inputs[geom_141-geom_241] - AssertionError: Regex pattern did not match.
       > = 48 failed, 2573 passed, 22 skipped, 1 xfailed, 22 xpassed, 18 warnings in 17.18s =
       > /nix/store/mas4ifv1v6llnqkyxq5w235x0hdq5yq3-stdenv-darwin/setup: line 1606: pop_var_context: head of shell_variables not a function context
       For full logs, run 'nix log /nix/store/zxkldmrggbhlz0iicgbwnfq528iawi8c-python3.10-pygeos-0.14.drv'.

@willcohen willcohen marked this pull request as draft June 28, 2023 02:03
@imincik
Copy link
Contributor

imincik commented Sep 20, 2023 •
edited
Loading

Shapely build fails now on

______________ OperationsTestCase.test_parallel_offset_linestring ______________

self = <tests.test_parallel_offset.OperationsTestCase testMethod=test_parallel_offset_linestring>

    def test_parallel_offset_linestring(self):
        line1 = LineString([(0, 0), (10, 0)])
        left = line1.parallel_offset(5, 'left')
        assert_geometries_equal(left, LineString([(0, 5), (10, 5)]))
        right = line1.parallel_offset(5, 'right')
        assert_geometries_equal(right, LineString([(10, -5), (0, -5)]), normalize=True)
        right = line1.parallel_offset(-5, 'left')
        assert_geometries_equal(right, LineString([(10, -5), (0, -5)]), normalize=True)
        left = line1.parallel_offset(-5, 'right')
        assert_geometries_equal(left, LineString([(0, 5), (10, 5)]))

        # by default, parallel_offset is right-handed
        assert_geometries_equal(line1.parallel_offset(5), right)

        line2 = LineString([(0, 0), (5, 0), (5, -5)])
>       assert_geometries_equal(line2.parallel_offset(2, 'left', resolution=1),
                                LineString([(0, 2), (5, 2), (7, 0), (7, -5)]))
E       AssertionError:
E       Geometries are not equal:
E
E       Not equal to tolerance 1e-07
E        x: array(<LINESTRING (0 2, 5 2, 5.39 1.962, 5.765 1.848, 6.111 1.663, 6.414 1.414, 6....>,
E             dtype=object)
E        y: array(<LINESTRING (0 2, 5 2, 7 0, 7 -5)>, dtype=object)

tests/test_parallel_offset.py:32: AssertionError

which is regression with GEOS 3.12.0. We might want to wait for shapely/shapely#1852 .

@sikmir sikmir mentioned this pull request Sep 25, 2023
Merged
12 tasks
@jtojnar
Copy link
Member

jtojnar commented Oct 28, 2023

Bumping shapely in #263989

@jtojnar jtojnar mentioned this pull request Oct 28, 2023
Merged
13 tasks
@doronbehar
Copy link
Contributor

doronbehar commented Nov 17, 2023

#263989 was merged.

@imincik
Copy link
Contributor

imincik commented Nov 17, 2023

#263989 was merged.

Thank you, I am just preparing PR with GEOS 3.12.1 which was released in meanwhile.

@imincik
Copy link
Contributor

imincik commented Nov 17, 2023

This PR is now replaced with #268130 (GEOS 3.12.1)

@imincik imincik closed this Nov 17, 2023
@willcohen
Copy link
Contributor Author

willcohen commented Nov 17, 2023

Thank you!

@ghpzin ghpzin mentioned this pull request Jul 8, 2024
Closed
@willcohen willcohen deleted the geos-3.12 branch July 12, 2024 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@imincik imincik Awaiting requested review from imincik

@nh2 nh2 Awaiting requested review from nh2

@sikmir sikmir Awaiting requested review from sikmir

Assignees

@imincik imincik

@willcohen willcohen

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@willcohen @imincik @jtojnar @doronbehar