Skip to content

Commit

Permalink
numpy: bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Oct 3, 2024
1 parent 8cbfa52 commit 99a0265
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
6 changes: 3 additions & 3 deletions recipes/numpy/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def config_options(self):
def configure(self):
self.settings.rm_safe("compiler.libcxx")
self.settings.rm_safe("compiler.cppstd")

def validate(self):
if conan_version.major == 1:
raise ConanInvalidConfiguration("Conan v1 is not supported")
Expand All @@ -50,8 +50,8 @@ def layout(self):
basic_layout(self, src_folder="src")

def requirements(self):
self.requires("openblas/0.3.26")
self.requires("cpython/3.12.2", transitive_headers=True, transitive_libs=True)
self.requires("openblas/0.3.27")
self.requires("cpython/3.12.7", transitive_headers=True, transitive_libs=True)

def build_requirements(self):
self.tool_requires("cpython/<host_version>")
Expand Down
12 changes: 9 additions & 3 deletions recipes/numpy/all/test_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,16 @@ def requirements(self):
self.requires(self.tested_reference_str)

def build_requirements(self):
self.tool_requires("meson/1.4.0")
self.tool_requires("cpython/3.12.2")
self.tool_requires("meson/[>=1.2.3 <2]")
self.tool_requires("cpython/3.12.7")
if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
self.tool_requires("pkgconf/2.1.0")
self.tool_requires("pkgconf/[>=2.2 <3]")

# Note: when building with CMake, the following is required:
# def generate(self):
# VirtualRunEnv(self).generate()
# # Required for find_package(Python) to work with cpython/*:shared=True
# VirtualRunEnv(self).generate(scope="build")

def build(self):
meson = Meson(self)
Expand Down

0 comments on commit 99a0265

Please sign in to comment.