Skip to content

Commit

Permalink
Merge pull request #7 from jan-janssen/main
Browse files Browse the repository at this point in the history
Enable Python 3.11 and 3.12
  • Loading branch information
jan-janssen authored Oct 20, 2023
2 parents 8bf6693 + 2c52c58 commit 71151c8
Show file tree
Hide file tree
Showing 9 changed files with 148 additions and 2 deletions.
8 changes: 8 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .ci_support/linux_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
cdt_name:
- cos6
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
target_platform:
- linux-64
20 changes: 20 additions & 0 deletions .ci_support/linux_64_python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
cdt_name:
- cos6
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
target_platform:
- linux-64
20 changes: 20 additions & 0 deletions .ci_support/osx_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
target_platform:
- osx-64
20 changes: 20 additions & 0 deletions .ci_support/osx_64_python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
target_platform:
- osx-64
28 changes: 28 additions & 0 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ source:
sha256: 548c14a463943e1dcc62143ef904370e15e5928ea9ad0c9d236d607020a1f38a
patches:
- setup.patch # [osx]
- pybind.patch

build:
script: {{ PYTHON }} -m pip install . -vv
number: 2
number: 3
skip: true # [win]
skip: true # [py>310]

requirements:
build:
Expand All @@ -25,13 +25,15 @@ requirements:
host:
- python
- pip
- pybind11
run:
- python
- ase
- numpy
- pandas
- psutil
- ruamel.yaml
- libcxx # [osx]

test:
imports:
Expand Down
22 changes: 22 additions & 0 deletions recipe/pybind.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 1018a2b28a472cdc9fb9ec95077cf016e89af816 Mon Sep 17 00:00:00 2001
From: Jan Janssen <[email protected]>
Date: Thu, 19 Oct 2023 21:28:36 +0200
Subject: [PATCH] Update CMakeLists.txt

---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f9c0ae..a752ba1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ set(WIGNER_PATH lib/ace/utils/wigner-cpp)
set(WIGNER_INCLUDE_PATH ${WIGNER_PATH}/include/wigner)
include_directories(${WIGNER_INCLUDE_PATH})

-add_subdirectory(lib/pybind11)
+find_package(pybind11)
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
endif ()

0 comments on commit 71151c8

Please sign in to comment.