diff --git a/.github/workflows/build_pkg.yml b/.github/workflows/build_pkg.yml index 60baffad..496945fd 100644 --- a/.github/workflows/build_pkg.yml +++ b/.github/workflows/build_pkg.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: platform: [ubuntu-latest, ] # macos-12, windows-2019] - python-version: ["3.11", "3.12",] + python-version: ["3.12",] runs-on: ${{ matrix.platform }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c9212ce5..ba14770f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,7 +9,7 @@ jobs: fail-fast: false matrix: platform: [ubuntu-latest, ] # macos-12, windows-2019] - python-version: ["3.11", "3.12", "3.13",] + python-version: ["3.12",] runs-on: ${{ matrix.platform }} diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml new file mode 100644 index 00000000..36a74654 --- /dev/null +++ b/conda-recipe/conda_build_config.yaml @@ -0,0 +1,28 @@ +python: + - 3.11 + - 3.11 + - 3.11 + - 3.12 + - 3.12 + - 3.12 + - 3.13 + + + +numpy: + - 1.26 + - 2.0 + - 2.1 + - 1.26 + - 2.0 + - 2.1 + - 2.1 + + +zip_keys: + - python + - numpy + +pin_run_as_build: + numpy: x.x + python: x.x \ No newline at end of file diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index a59cd15e..50b5968f 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: aare - version: 2024.10.30.dev1 #TODO! how to not duplicate this? + version: 2024.11.07.dev0 #TODO! how to not duplicate this? source: path: .. @@ -13,14 +13,16 @@ build: requirements: build: - - python + - python {{python}} + - numpy {{ numpy }} - {{ compiler('cxx') }} - - numpy >=2.0.0 + host: - cmake - ninja - - python + - python {{python}} + - numpy {{ numpy }} - pip - scikit-build-core - pybind11 >=2.13.0 @@ -28,11 +30,10 @@ requirements: - zeromq - nlohmann_json - catch2 - - numpy >=2.0.0 run: - - python - - numpy >=2.0.0 + - python {{python}} + - numpy {{ numpy }} test: diff --git a/pyproject.toml b/pyproject.toml index b75ed03e..baf6e388 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build" [project] name = "aare" -version = "2024.10.30.dev1" +version = "2024.11.07.dev0" [tool.scikit-build] cmake.verbose = true