diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d0deba2..c407be9 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,6 +16,10 @@ jobs: CONFIG: linux_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy2.0python3.12.____cpython: + CONFIG: linux_64_numpy2.0python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy2.0python3.9.____cpython: CONFIG: linux_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 191ee8e..188b1f4 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -14,6 +14,9 @@ jobs: osx_64_numpy2.0python3.11.____cpython: CONFIG: osx_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_64_numpy2.0python3.12.____cpython: + CONFIG: osx_64_numpy2.0python3.12.____cpython + UPLOAD_PACKAGES: 'True' osx_64_numpy2.0python3.9.____cpython: CONFIG: osx_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 0000000..afd9756 --- /dev/null +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,31 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +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 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 0000000..c0171a1 --- /dev/null +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,31 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - python + - numpy diff --git a/README.md b/README.md index cd22035..9f5673a 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,13 @@ Current build status variant + + linux_64_numpy2.0python3.12.____cpython + + + variant + + linux_64_numpy2.0python3.9.____cpython @@ -70,6 +77,13 @@ Current build status variant + + osx_64_numpy2.0python3.12.____cpython + + + variant + + osx_64_numpy2.0python3.9.____cpython diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cc683fb..db3d819 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,8 +9,8 @@ source: sha256: f5333804748d35fae0a4b4c7b7346171b99f4c22e1c21620dc822af34145cb49 build: - number: 0 - skip: true # [py<39 or py>311] + number: 1 + skip: true # [py<39 or (win and py>311)] entry_points: - fluidimviewer-pg = fluidimage.gui.pg_main:main - fluidimviewer = fluidimage.gui.imviewer:main @@ -57,6 +57,11 @@ requirements: test: imports: - cv2 + # Pythran extensions + - fluidimage.calcul.__pythran__.correl + - fluidimage.calcul.__pythran__.subpix + - fluidimage.calcul.interpolate.__pythran__.thin_plate_spline + - fluidimage.topologies.__pythran__.example - fluidimage - fluidimage.calcul - fluidimage.calcul.interpolate @@ -72,11 +77,6 @@ test: - fluidimage.works - fluidimage.preproc - fluidimage.works.piv - # Pythran extensions - - fluidimage.calcul.__pythran__.correl - - fluidimage.calcul.__pythran__.subpix - - fluidimage.calcul.interpolate.__pythran__.thin_plate_spline - - fluidimage.topologies.__pythran__.example commands: - fluidimviewer-pg --help - fluidimviewer --help