Skip to content

Commit 4add94e

Browse files
committed
Fixes conda build
1 parent 5ac615d commit 4add94e

File tree

5 files changed

+5
-13
lines changed

5 files changed

+5
-13
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ dependencies = [
6565
"h5py",
6666
#"ipp==2021.12.*", # PyPI conflicts with conda package
6767
"numba",
68-
"numpy>=1.23",
68+
"numpy>=1.23,<2.0",
6969
"olefile>=0.46",
7070
"pillow",
7171
"pywavelets",

recipe/bld.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ if not "%GIT_DESCRIBE_NUMBER%"=="0" (
66
)
77
:: -G "Visual Studio 16 2019" specifies the the generator
88
:: -T v142 specifies the toolset
9-
pip install . --no-deps -Ccmake.args="-G Visual Studio 16 2019 -T v142"
9+
uv pip install . -Ccmake.args="-G Visual Studio 16 2019 -T v142"
1010
if errorlevel 1 exit 1

recipe/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ export SETUPTOOLS_SCM_PRETEND_VERSION_FOR_CIL="${PKG_VERSION}"
1313
if test "${GIT_DESCRIBE_NUMBER}" != "0"; then
1414
export SETUPTOOLS_SCM_PRETEND_VERSION_FOR_CIL="${PKG_VERSION}.dev${GIT_DESCRIBE_NUMBER}+${GIT_DESCRIBE_HASH}"
1515
fi
16-
pip install . --no-deps -Ccmake.args="${extra_args}"
16+
uv pip install .

recipe/conda_build_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#creates pairs of versions using zip_keys, lists must be the same length
2121
ipp_version:
22-
- '2021.12'
22+
- '2022.1'
2323
python:
2424
- 3.10
2525
- 3.10

recipe/meta.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ test:
3939
requirements:
4040
build:
4141
- python
42-
- numpy {{ numpy }}
43-
- pip
44-
- setuptools >=64
45-
- setuptools_scm >=8
42+
- uv
4643
- cmake # [not osx]
4744
- cmake >=3.16 # [osx]
4845
- libgcc-ng # [linux]
@@ -51,10 +48,6 @@ requirements:
5148
- openmp # [osx]
5249
- vc 14 # [win]
5350
- ninja # [not win]
54-
- ipp-include {{ ipp_version }}
55-
- ipp-devel {{ ipp_version }}
56-
- ipp {{ ipp_version }}
57-
- scikit-build-core >=0.10
5851

5952
run:
6053
- python
@@ -71,7 +64,6 @@ requirements:
7164
- olefile >=0.46
7265
- pywavelets
7366
- cil-data >=22
74-
- {{ pin_compatible('ipp', min_pin='x.x', max_pin='x.x') }}
7567
- tqdm
7668
- numba
7769

0 commit comments

Comments
 (0)