Update most dependencies to latest (2024-06) #318

dhermes · 2024-06-17T20:56:24Z

Still sorting out some issues with NumPy 2.0 (I'll do this in another PR to keep the diffs separate / cleaner)

…nce).

… out).

dhermes · 2024-06-17T20:57:20Z

noxfile.py

@@ -67,6 +68,10 @@
 RELEASE_SESSION_NAME = "libbezier-release"
 INSTALL_PREFIX_ENV = "BEZIER_INSTALL_PREFIX"
 EXTRA_DLL_ENV = "BEZIER_EXTRA_DLL"
+_OS_MAKEDIRS_EXIST_OK = functools.partial(os.makedirs, exist_ok=True)


Session.run() has deprecated the use of kwargs passing through to callables

dhermes · 2024-06-17T20:57:35Z

noxfile.py

-        session.run_always(print, "Using pre-installed ``cmake``")
-        session.run_always("cmake", "--version", external=cmake_external)
+        session.run_install(print, "Using pre-installed ``cmake``")
+        session.run_install("cmake", "--version", external=cmake_external)


run_always() is now just an alias for run_install()

dhermes · 2024-06-17T20:58:36Z

For an example of the errors relating to NumPy 2.0:

      src/python/bezier/_speedup.c:40168:75: error: ‘PyArray_Descr’ {aka ‘struct _PyArray_Descr’} has no member named ‘elsize’
      40168 |   __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v_6bezier_8_speedup_SEGMENT_DTYPE->elsize); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1163, __pyx_L1_error)
            |

…rch)

Seems to be a race condition / the commands seem to run before `session.run()` preceding.

dhermes · 2024-06-18T04:59:32Z

.github/workflows/macos.yaml

@@ -30,7 +30,7 @@ on:

 jobs:
  ci:
-    runs-on: macos-latest
+    runs-on: macos-13


This is temporary!

See: actions/setup-python#547

In particular, the architecture on macos-latest (macos-14) machines means that mixed-architecture dylibs are produced by gcc.

See for example a failed build:

... Successfully built bezier nox > delocate-wheel --wheel-dir /var/folders/dm/88b38gj92jj53dgxdsm12qf00000gn/T/tmpraciqawj --verbose /var/folders/dm/88b38gj92jj53dgxdsm12qf00000gn/T/tmpizrl0uv3/bezier-2023.7.29.dev1-cp311-cp311-macosx_10_9_universal2.whl Fixing: /var/folders/dm/88b38gj92jj53dgxdsm12qf00000gn/T/tmpizrl0uv3/bezier-2023.7.29.dev1-cp311-cp311-macosx_10_9_universal2.whl Traceback (most recent call last): File "/Users/runner/work/bezier/bezier/.nox/doctest/bin/delocate-wheel", line 8, in <module> sys.exit(main()) ^^^^^^ File "/Users/runner/work/bezier/bezier/.nox/doctest/lib/python3.11/site-packages/delocate/cmd/delocate_wheel.py", line 110, in main copied = delocate_wheel( ^^^^^^^^^^^^^^^ File "/Users/runner/work/bezier/bezier/.nox/doctest/lib/python3.11/site-packages/delocate/delocating.py", line 971, in delocate_wheel copied_libs = delocate_path( ^^^^^^^^^^^^^^ File "/Users/runner/work/bezier/bezier/.nox/doctest/lib/python3.11/site-packages/delocate/delocating.py", line 509, in delocate_path lib_dict = tree_libs_from_directory( ^^^^^^^^^^^^^^^^^^^^^^^^^ File "/Users/runner/work/bezier/bezier/.nox/doctest/lib/python3.11/site-packages/delocate/libsana.py", line 377, in tree_libs_from_directory return _tree_libs_from_libraries( ^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/Users/runner/work/bezier/bezier/.nox/doctest/lib/python3.11/site-packages/delocate/libsana.py", line 304, in _tree_libs_from_libraries for depending_path, install_name in get_dependencies( File "/Users/runner/work/bezier/bezier/.nox/doctest/lib/python3.11/site-packages/delocate/libsana.py", line 102, in get_dependencies for install_name in get_install_names(lib_fname): ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/Users/runner/work/bezier/bezier/.nox/doctest/lib/python3.11/site-packages/delocate/tools.py", line 559, in get_install_names names_data = _check_ignore_archs(_parse_otool_install_names(otool.stdout)) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/Users/runner/work/bezier/bezier/.nox/doctest/lib/python3.11/site-packages/delocate/tools.py", line 413, in _check_ignore_archs raise NotImplementedError( NotImplementedError: This function does not support separate values per-architecture: {'x86_64': [('/usr/lib/libSystem.B.dylib', '1.0.0', '1336.0.0')], 'arm64': [('@rpath/libbezier.2023.dylib', '2023.0.0', '2023.7.28'), ('/usr/lib/libSystem.B.dylib', '1.0.0', '1336.0.0')]} nox > Command delocate-wheel --wheel-dir /var/folders/dm/88b38gj92jj53dgxdsm12qf00000gn/T/tmpraciqawj --verbose /var/folders/dm/88b38gj92jj53dgxdsm12qf00000gn/T/tmpizrl0uv3/bezier-2023.7.29.dev1-cp311-cp311-macosx_10_9_universal2.whl failed with exit code 1 ...

dhermes · 2024-06-18T04:59:50Z

docs/python/binary-extension.rst

     Tag        Type                         Name/Value
    0x000000000000000f (RPATH)              Library rpath: [$ORIGIN/../bezier.libs]
    0x0000000000000001 (NEEDED)             Shared library: [libbezier-631d8eda.so.2023.7.28]
    0x0000000000000001 (NEEDED)             Shared library: [libpthread.so.0]
    0x0000000000000001 (NEEDED)             Shared library: [libc.so.6]
    0x000000000000000c (INIT)               0x6000
-    0x000000000000000d (FINI)               0x7ef80
+    0x000000000000000d (FINI)               0x7f630


Expected when Cython generated code gets updated

dhermes · 2024-06-18T05:00:04Z

noxfile.py

-    "numpy": "numpy >= 1.25.2",
-    "pycobertura": "pycobertura >= 3.2.1",
+    "matplotlib": "matplotlib >= 3.9.0",
+    "numpy": "numpy >= 1.26.4, < 2",


Handling 2.0 in another PR

dhermes · 2024-06-18T05:00:43Z

noxfile.py

+        "python",
+        "-m",


I added this when debugging (I was worried something was wrong in pip resolution). I didn't end up needing this change but python -m pip is more canonical so keeping it.

dhermes · 2024-06-18T05:02:37Z

noxfile.py

+    if IS_MACOS:
+        build_args.append("-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=13.0")


This is temporary! The default value used by CMake is whatever the current version is on the machine. Here that's 13.6 as of https://github.com/actions/runner-images/blob/3793317199f7f1eebff21ae96c77878546f06389/images/macos/macos-13-Readme.md.

However, only 13.0 is allowed, e.g.:

$ python3.11 -m pip debug --verbose | grep cp311-cp311-macosx_13 cp311-cp311-macosx_13_0_x86_64 cp311-cp311-macosx_13_0_intel cp311-cp311-macosx_13_0_fat64 cp311-cp311-macosx_13_0_fat32 cp311-cp311-macosx_13_0_universal2 cp311-cp311-macosx_13_0_universal

dhermes · 2024-06-18T05:04:42Z

I hope I can ditch the cobbled together tooling and use cibuildwheel when installing from a wheel in doctests.

dhermes added 9 commits June 17, 2024 14:58

session.run() can no longer pass kwargs to callables.

3be79b2

Replace run_always() with alias run_install().

d1ebe7a

session.run() can no longer pass kwargs to callables (another insta…

23cf406

…nce).

Ran nox -s update_generated.

7d83c8a

Update lower bound for Cython dependency.

245f6fd

Not ready for Numpy 2.0 yet (breaks Cython in ways I have yet to sort…

ee15816

… out).

Update all lower bounds.

b0fe44c

Ran nox -s blacken with updated deps.

19656b7

Update dependencies in docs/requirements.txt and setup.py.

619a6ef

dhermes commented Jun 17, 2024

View reviewed changes

dhermes added 17 commits June 17, 2024 16:01

Update dumpbin output on Windows doctest.

6c76aba

Put NumPy upper bound on build-wheel-for-doctest.sh.

63cda4d

Fix readelf Linux output.

dcf10cb

Limit to x86 for macOS (CI machines in GitHub Actions are now multi-a…

278d11d

…rch)

Try the actual arch (still think this will not work).

5344cb6

Try to specify architecture in actions/setup-python.

184ab35

Try using CMAKE_OSX_ARCHITECTURES.

7459590

Downgrade to macos-13.

36082f5

Remove the --require-archs.

5317aa0

Use session.run() to delete directories.

51bbcf6

Seems to be a race condition / the commands seem to run before `session.run()` preceding.

Add debug ls -alFG.

faac2a4

Temporarily disable workflow runs not needed.

5071dbb

Run even less, forgot external=True.

e2311fe

Is the issue pip vs. python -m pip?

55595a4

Some more debug.

0dd613c

Target 13.0 (not 13.6).

23da3a9

Revert debug changes.

2889190

dhermes commented Jun 18, 2024

View reviewed changes

dhermes merged commit 62d62cd into main Jun 18, 2024
11 checks passed

dhermes deleted the dhermes/latest-deps-2024-06 branch June 18, 2024 05:04

dhermes added packaging language: python labels Jun 20, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update most dependencies to latest (2024-06) #318

Update most dependencies to latest (2024-06) #318

dhermes commented Jun 17, 2024 •

edited

Loading

dhermes Jun 17, 2024

dhermes Jun 17, 2024

dhermes commented Jun 17, 2024

dhermes Jun 18, 2024

dhermes Jun 18, 2024

dhermes Jun 18, 2024

dhermes Jun 18, 2024

dhermes Jun 18, 2024 •

edited

Loading

dhermes commented Jun 18, 2024

		if IS_MACOS:
		build_args.append("-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=13.0")

Update most dependencies to latest (2024-06) #318

Update most dependencies to latest (2024-06) #318

Conversation

dhermes commented Jun 17, 2024 • edited Loading

dhermes Jun 17, 2024

Choose a reason for hiding this comment

dhermes Jun 17, 2024

Choose a reason for hiding this comment

dhermes commented Jun 17, 2024

dhermes Jun 18, 2024

Choose a reason for hiding this comment

dhermes Jun 18, 2024

Choose a reason for hiding this comment

dhermes Jun 18, 2024

Choose a reason for hiding this comment

dhermes Jun 18, 2024

Choose a reason for hiding this comment

dhermes Jun 18, 2024 • edited Loading

Choose a reason for hiding this comment

dhermes commented Jun 18, 2024

dhermes commented Jun 17, 2024 •

edited

Loading

dhermes Jun 18, 2024 •

edited

Loading