Skip to content

Fix: allow conda builds with Python 3.5 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roryyorke merged 1 commit into from
Apr 23, 2019
Merged

Fix: allow conda builds with Python 3.5 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion conda-recipe-openblas/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ RD /S /Q _skbuild
set BLAS_ROOT=%PREFIX%
set LAPACK_ROOT=%PREFIX%
set NUMPY_INCLUDE=%PREFIX%\Include
set F2PY=%PREFIX%\Scripts\f2py.exe
:: Prefer f2py.exe, if it exists; this is provided by numpy 1.16 (and, we assume, later)
if EXIST "%PREFIX%\Scripts\f2py.exe" (
set F2PY=%PREFIX%\Scripts\f2py.exe
) ELSE (
:: Otherwise use f2py.bat, which is provided by numpy 1.15 and earlier
set F2PY=%PREFIX%\Scripts\f2py.bat
)

"%PYTHON%" setup.py install

Expand Down
6 changes: 3 additions & 3 deletions conda-recipe-openblas/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build:
requirements:
build:
- python {{ PY_VER }}
- numpy >=1.16
- numpy
- openblas >=0.3.0
- {{ compiler('c') }} # [not osx]
- gcc # [osx]
Expand All @@ -22,7 +22,7 @@ requirements:
host:
- python {{ PY_VER }}
- flang # [win]
- numpy >=1.16
- numpy
- openblas >=0.3.0
- libgfortran-ng # [not-win]
- libgcc-ng # [linux]
Expand All @@ -33,7 +33,7 @@ requirements:

run:
- python {{ PY_VER }}
- numpy >=1.16
- {{ pin_compatible('numpy') }}
Copy link
Contributor

@moorepants moorepants Apr 19, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking more closely I see these recipes are not for conda-forge builds, so I don't think the pin_compatible will do anything here. I think that is specific to conda-forge. Maybe you just want to pin to numpy 1.11.* in the build section for these custom conda build scripts.

Copy link
Contributor

@moorepants moorepants Apr 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is a relevant note in the conda build docs: https://docs.conda.io/projects/conda-build/en/latest/user-guide/tutorials/building-conda-packages.html#edit-the-skeleton-files

Copy link
Contributor

@moorepants moorepants Apr 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks relevant too: https://docs.conda.io/projects/conda-build/en/latest/resources/variants.html?highlight=numpy

- openblas >=0.3.0
- libgfortran-ng # [not win]
- libgcc-ng # [linux]
Expand Down
8 changes: 7 additions & 1 deletion conda-recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ RD /S /Q _skbuild
set BLAS_ROOT=%PREFIX%
set LAPACK_ROOT=%PREFIX%
set NUMPY_INCLUDE=%PREFIX%\Include
set F2PY=%PREFIX%\Scripts\f2py.exe
:: Prefer f2py.exe, if it exists; this is provided by numpy 1.16 (and, we assume, later)
if EXIST "%PREFIX%\Scripts\f2py.exe" (
set F2PY=%PREFIX%\Scripts\f2py.exe
) ELSE (
:: Otherwise use f2py.bat, which is provided by numpy 1.15 and earlier
set F2PY=%PREFIX%\Scripts\f2py.bat
)

"%PYTHON%" setup.py install

Expand Down
6 changes: 3 additions & 3 deletions conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ requirements:
# conda-forge might have the configuration in place for clang build and link?
build:
- python {{PY_VER}}
- numpy >=1.16
- numpy
- {{ compiler('c') }} # [not osx]
- gcc # [osx]
- {{ compiler('fortran') }} # [linux]
Expand All @@ -25,7 +25,7 @@ requirements:
host:
- python {{ PY_VER }}
- flang # [win]
- numpy >=1.16
- numpy
- mkl
- libgfortran-ng # [not win]
- libgcc-ng # [linux]
Expand All @@ -37,7 +37,7 @@ requirements:

run:
- python {{ PY_VER }}
- numpy >=1.16
- {{ pin_compatible('numpy') }}
- mkl
- libgfortran-ng # [not win]
- libgcc-ng # [linux]
Expand Down