Skip to content

Commit ce88d21

Browse files
committed
Update dependencies to the latest versions
1 parent bff7d33 commit ce88d21

File tree

9 files changed

+37
-22
lines changed

9 files changed

+37
-22
lines changed

.github/workflows/test_package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
fail-fast: false
88
matrix:
99
os: [windows-latest, ubuntu-latest, macos-latest]
10-
embedded-py: [3.11.5, 3.12.4]
10+
embedded-py: [3.11.5, 3.12.7]
1111
name: "${{ matrix.os }}, ${{ matrix.embedded-py }}"
1212
env:
1313
create_pck: conan create . -o embedded_python-core/*:version=${{ matrix.embedded-py }} --build=missing --user=lumicks --channel=testing

changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## v1.10.0 | TBD
44

55
- Dropped support for Conan v1.
6+
- Updated default recipe options to `pip` v24.3.1, `setuptools` v75.3.0, `wheel` v0.45.0, and `pip-licenses` v5.0.0.
67

78
## v1.9.1 | 2024-06-17
89

conanfile.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ class EmbeddedPython(ConanFile):
2626
}
2727
default_options = {
2828
"packages": None,
29-
"pip_version": "24.0",
30-
"pip_licenses_version": "4.4.0",
31-
"setuptools_version": "69.5.1",
32-
"wheel_version": "0.43.0",
29+
"pip_version": "24.3.1",
30+
"pip_licenses_version": "5.0.0",
31+
"setuptools_version": "75.3.0",
32+
"wheel_version": "0.45.0",
3333
}
3434
exports_sources = "embedded_python.cmake"
3535

core/conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ def requirements(self):
5252
if self.settings.os == "Windows":
5353
return # on Windows, we download a binary, so we don't need anything else
5454

55-
self.requires("sqlite3/3.45.3")
55+
self.requires("sqlite3/3.47.0")
5656
self.requires("bzip2/1.0.8")
5757
self.requires("xz_utils/5.4.5")
5858
self.requires("zlib/[>=1.2.11 <2]")
5959
self.requires("openssl/[>=3 <4]")
6060
if self.settings.os == "Linux":
61-
self.requires("libffi/3.4.4")
61+
self.requires("libffi/3.4.6")
6262
self.requires("libuuid/1.0.3")
6363
self.requires("mpdecimal/2.5.1")
6464

license.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2021, LUMICKS B.V.
1+
Copyright (c) 2024, LUMICKS B.V.
22

33
Apache License, Version 2.0, January 2004, http://www.apache.org/licenses/
44

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.black]
22
line-length = 100
3-
target-version = ['py311']
3+
target-version = ['py312']
44
extend-exclude = '''
55
(
66
/(

test_package/numpy/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
hypothesis==6.103.1
2-
numpy==1.26.4
1+
hypothesis==6.118.7
2+
numpy==2.1.3
33
pytest-xdist==3.6.1
4-
pytest==8.2.2
4+
pytest==8.3.3
55
typing-extensions==4.12.2

test_package/numpy/test.py

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
"""`numpy` distributes its tests: run them"""
22

3+
import os
4+
import pathlib
35
import sys
46
import numpy as np
57

6-
# `test_mem_policy.py` and `f2py/*` tests fail with Python 3.11 due to `numpy.distutils`
7-
# deprecations and issues with the latest `setuptools`. Ignore it until it's resolves in `numpy`.
8-
sys.exit(
9-
not np.test(
10-
verbose=2,
11-
extra_argv=["-n", "auto", "-k=not test_mem_policy and not f2py"],
12-
)
13-
)
8+
# `--ignore-glob` expands patterns as absolute paths in the current folder
9+
os.chdir(pathlib.Path.home())
10+
11+
skip_tests = [
12+
"test_mem_policy", # requires `meson`
13+
"test_configtool", # `numpy-config` is not on PATH in the embedded env
14+
]
15+
16+
if sys.version_info < (3, 12):
17+
skip_tests += ["test_public_api"] # fails with Python 3.11 due to `numpy.distutils`
18+
19+
pytest_args = [
20+
"-n=auto",
21+
"-k=" + " and ".join([f"not {x}" for x in skip_tests]),
22+
# `f2py` requires `meson` and the tests are very slow so we want to skip them. They must be
23+
# excluded with `ignore-glob` to avoid even collecting them because of import errors.
24+
"--ignore-glob=*f2py*",
25+
]
26+
27+
sys.exit(not np.test(verbose=2, extra_argv=pytest_args))

test_package/pylake/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
lumicks.pylake[notebook] @ git+https://github.com/lumicks/pylake@86d6a6bd2d2acf5463869d74e69d2a34b0e962c2
2-
# Equivalent to pylake 1.5.1 but using a specific commit to validate the functionality
1+
lumicks.pylake[notebook] @ git+https://github.com/lumicks/pylake@40eec8a7001c70fa14fa67db0e29d28dcb78b445
2+
# Equivalent to pylake 1.5.3 but using a specific commit to validate the functionality

0 commit comments

Comments
 (0)