diff --git a/conda/bld.bat b/conda/bld.bat new file mode 100644 index 0000000..eb0ab33 --- /dev/null +++ b/conda/bld.bat @@ -0,0 +1,6 @@ +@echo off +call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" +set "CC=cl" +set "FC=flang-new" +set "MESON_RSP_THRESHOLD=320000" +%python% -m pip install . --no-deps --ignore-installed --no-build-isolation -vv \ No newline at end of file diff --git a/conda/build.sh b/conda/build.sh new file mode 100644 index 0000000..4f56bcd --- /dev/null +++ b/conda/build.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +$PYTHON -m pip install . --no-deps --ignore-installed --no-build-isolation -vv \ No newline at end of file diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml deleted file mode 100644 index 543eff2..0000000 --- a/conda/conda_build_config.yaml +++ /dev/null @@ -1,2 +0,0 @@ -c_compiler: - - m2w64-toolchain # [win] \ No newline at end of file diff --git a/conda/meta.yaml b/conda/meta.yaml index 82c1376..49b4859 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -19,10 +19,7 @@ source: build: number: 0 string: py{{ PY_VER }} - script_env: - - CC=gcc # [win] preserve_egg_dir: True - script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv requirements: host: @@ -35,8 +32,7 @@ requirements: {% for dep in build_deps %} - {{ dep }} {% endfor %} - - {{ compiler('fortran') }} # [not win] - - {{ compiler('c') }} + - compilers - charset-normalizer run: - python diff --git a/pyproject.toml b/pyproject.toml index 9cfbb33..6c905ce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ requires = [ "setuptools", "setuptools_scm", "meson-python", - "numpy", # mandatory for f2py which is distributed with numpy + "numpy>2.0.0", # mandatory for f2py which is distributed with numpy ] #build-backend = "setuptools.build_meta" build-backend = "mesonpy" @@ -20,6 +20,9 @@ fallback_version = "2.1.0.dev0" version_scheme = "guess-next-dev" local_scheme = "no-local-version" +[tool.meson-python.args] +setup = ['-Dfortran_std=none'] + [project] name = "openalea.ratp" authors = [