Skip to content

Commit cfaf9e7

Browse files
Merge branch 'fftw'
2 parents 4c97050 + bc7eb30 commit cfaf9e7

10 files changed

+54
-36
lines changed

.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ channel_targets:
1010
- cryoem main
1111
docker_image:
1212
- quay.io/condaforge/linux-anvil-cos7-x86_64
13+
fftw:
14+
- '3'
1315
numpy:
1416
- '1.23'
1517
openmpi:

.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ channel_targets:
1010
- cryoem main
1111
docker_image:
1212
- quay.io/condaforge/linux-anvil-cos7-x86_64
13+
fftw:
14+
- '3'
1315
numpy:
1416
- '1.26'
1517
openmpi:

.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ MACOSX_SDK_VERSION:
55
c_compiler:
66
- clang
77
c_compiler_version:
8-
- '17'
8+
- '18'
99
channel_sources:
1010
- conda-forge
1111
channel_targets:
1212
- cryoem main
13+
fftw:
14+
- '3'
1315
macos_machine:
1416
- x86_64-apple-darwin13.4.0
1517
numpy:

.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ MACOSX_SDK_VERSION:
55
c_compiler:
66
- clang
77
c_compiler_version:
8-
- '17'
8+
- '18'
99
channel_sources:
1010
- conda-forge
1111
channel_targets:
1212
- cryoem main
13+
fftw:
14+
- '3'
1315
macos_machine:
1416
- x86_64-apple-darwin13.4.0
1517
numpy:

.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ MACOSX_SDK_VERSION:
55
c_compiler:
66
- clang
77
c_compiler_version:
8-
- '17'
8+
- '18'
99
channel_sources:
1010
- conda-forge
1111
channel_targets:
1212
- cryoem main
13+
fftw:
14+
- '3'
1315
macos_machine:
1416
- arm64-apple-darwin20.0.0
1517
numpy:

.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ MACOSX_SDK_VERSION:
55
c_compiler:
66
- clang
77
c_compiler_version:
8-
- '17'
8+
- '18'
99
channel_sources:
1010
- conda-forge
1111
channel_targets:
1212
- cryoem main
13+
fftw:
14+
- '3'
1315
macos_machine:
1416
- arm64-apple-darwin20.0.0
1517
numpy:

.github/workflows/conda-build.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,6 @@ jobs:
9999
fi
100100
./.scripts/run_osx_build.sh
101101
102-
- name: Install Miniconda for windows
103-
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
104-
with:
105-
miniforge-version: latest
106-
if: matrix.os == 'windows'
107-
108102
- name: Build on windows
109103
shell: cmd
110104
run: |
@@ -113,6 +107,7 @@ jobs:
113107
set "sha=%GITHUB_SHA%"
114108
call ".scripts\run_win_build.bat"
115109
env:
110+
MINIFORGE_HOME: D:\Miniforge
116111
PYTHONUNBUFFERED: 1
117112
CONFIG: ${{ matrix.CONFIG }}
118113
CI: github_actions

.scripts/build_steps.sh

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.scripts/run_osx_build.sh

+27-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

recipe/meta.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set version = "3.1.1" %}
1+
{% set version = "4.0.0" %}
22
{% set tag = "v" + version %}
33

44
package:
@@ -28,12 +28,12 @@ requirements:
2828
- python
2929
- numpy
3030
- openmpi
31-
- fftw * mpi_openmpi_*
31+
- fftw
3232
run:
3333
- python
3434
- {{ pin_compatible('numpy', min_pin='x.x', max_pin='x.x') }}
3535
- openmpi
36-
- fftw * mpi_openmpi_*
36+
- fftw
3737

3838
test:
3939
requires:

0 commit comments

Comments
 (0)