Skip to content
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

Try to trigger new boost build #123

Merged
merged 10 commits into from
Dec 22, 2020
Merged

Try to trigger new boost build #123

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4ef26c6
Update meta.yaml
jan-janssen Dec 22, 2020
24bcdb9
MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.5, and con…
Dec 22, 2020
c3f4148
Update meta.yaml
jan-janssen Dec 22, 2020
3b52d2b
Update meta.yaml
jan-janssen Dec 22, 2020
020488b
MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.5, and con…
jan-janssen Dec 22, 2020
ebc15ac
Increase build number
jan-janssen Dec 22, 2020
0b47bdf
Fix boost-cpp deps, use hdf5 dep from run_exports
mbargull Dec 22, 2020
aa050ff
MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.5, and con…
Dec 22, 2020
a844a73
Separate CI jobs for boost-cpp versions
mbargull Dec 22, 2020
6cf0bfd
MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.5, and con…
Dec 22, 2020
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: 6 additions & 2 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

1 change: 0 additions & 1 deletion .ci_support/linux_64_.yaml → .ci_support/linux_64_boost_cpp1.72.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
boost_cpp:
- 1.72.0
- 1.74.0
c_compiler:
- gcc
c_compiler_version:
Expand Down
65 changes: 65 additions & 0 deletions .ci_support/linux_64_boost_cpp1.74.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
boost_cpp:
- 1.74.0
c_compiler:
- gcc
c_compiler_version:
- '9'
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
docker_image:
- quay.io/condaforge/linux-anvil-comp7
hdf5:
- 1.10.6
libblas:
- 3.8 *netlib
libcblas:
- 3.8 *netlib
mpi:
- mpich
numpy:
- '1.16'
- '1.16'
- '1.16'
- '1.19'
petsc:
- '3.13'
petsc4py:
- '3.13'
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
zlib:
max_pin: x.x
ptscotch:
- 6.0.9
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
slepc:
- '3.13'
slepc4py:
- '3.13'
suitesparse:
- '5.6'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - numpy
- python
zlib:
- '1.2'
11 changes: 9 additions & 2 deletions README.md
View file
Open in desktop

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

6 changes: 2 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ source:
- linuxboost.patch # [linux]

build:
number: 14
number: 15
skip: true # [win]

outputs:
Expand Down Expand Up @@ -164,8 +164,7 @@ outputs:
- suitesparse
- zlib
- fenics-ffc =={{ version }}
- hdf5 * {{ mpi_prefix }}_*
Copy link
Member

Choose a reason for hiding this comment

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

hdf5 has a run_export has includes the MPI variant. We can rely on that one.

- {{ pin_compatible("boost-cpp", exact=True) }}
Copy link
Member

Choose a reason for hiding this comment

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

{{ pin_compatible(..., exact=True) }} means that it pins to the exact build (i.e., on the build string level).
Here you rather want a plain boost-cpp in host/run so that conda-build will replace it with the pinnings definition.

Copy link
Member Author

Choose a reason for hiding this comment

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

The fenics package requires the exact boost-cpp version which is the cause of conda-forge/mshr-feedstock#18

Copy link
Member

Choose a reason for hiding this comment

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

exact boost-cpp version

Exact version would be understandable. But the current conda-forge-pinning already has a max_pin: x.x.x for boost-cpp which means if you have it in host and run, then you'd get a pin to >=1.72.0,<1.73.0a0.
Exact build is what doesn't seem sensible to me.

Copy link
Member

Choose a reason for hiding this comment

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

If you don't trust conda-forge-pinning (e.g., to avoid a max_pin change affecting this recipe), you can do {{ pin_compatible("boost-cpp", max_pin="x.x.x") }} yourself.

- boost-cpp
run_constrained:
- fenics =={{ version }}
test:
Expand Down Expand Up @@ -226,7 +225,6 @@ outputs:
- fenics-fiat =={{ version }}
- fenics-ufl =={{ version }}
- fenics-ffc =={{ version }}
- hdf5 * {{ mpi_prefix }}_*
run_constrained:
- fenics =={{ version }}

Expand Down