Skip to content

Commit

Permalink
Replace occurrences of build env in nest-config (#114)
Browse files Browse the repository at this point in the history
* Replace build_env after intsall

* Bump build number

* MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.0, and conda-forge-pinning 2024.05.24.03.56.36

* Fix linting

* MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.0, and conda-forge-pinning 2024.05.24.03.56.36

* Fix linting

* Fix linting

* Fix sed

* Fix path
  • Loading branch information
steffengraber authored May 24, 2024
1 parent a7c7863 commit f3b168b
Show file tree
Hide file tree
Showing 20 changed files with 45 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

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

2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
channel_sources:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
channel_sources:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
channel_sources:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
channel_sources:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
channel_sources:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.12'
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.12'
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.12'
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.12'
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.12'
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
Expand Down
4 changes: 2 additions & 2 deletions .gitattributes

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

8 changes: 6 additions & 2 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Please consult conda-forge/core before doing this
MACOSX_SDK_VERSION: # [osx and x86_64]
- "10.12" # [osx and x86_64]
# MACOSX_SDK_VERSION: # [osx and x86_64]
# - "10.12" # [osx and x86_64]
c_stdlib_version: # [linux]
- 2.17 # [linux]
c_stdlib_version: # [osx and x86_64]
- 10.13 # [osx and x86_64]
7 changes: 4 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "nest-simulator" %}
{% set version = "3.7" %}
{% set build = 1 %}
{% set build = 2 %}

package:
name: {{ name|lower }}
Expand All @@ -26,7 +26,8 @@ requirements:
- libgomp # [linux]
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- sysroot_linux-64 2.17 # [linux64]
- {{ stdlib("c") }}

host:
- cython
- gsl >=1.11
Expand Down Expand Up @@ -80,7 +81,7 @@ test:
- mypy >=0.8
- cppcheck
imports:
- nest
- nest
commands:
- nest --help
- sli --help
Expand Down
2 changes: 2 additions & 0 deletions recipe/post-link.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ COMPILER="${CONDA_PREFIX}/bin/${COMPILER_NAME}"
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
cp "${CONDA_PREFIX}"/bin/nest-config "${CONDA_PREFIX}"/bin/nest-config-"${now}".orig
sed -i "s|${COMPILER_FULL}|${COMPILER}|g" "${CONDA_PREFIX}"/bin/nest-config
sed -E -i "s|\/home.*\/_build_env|${CONDA_PREFIX}|g" "${CONDA_PREFIX}"/bin/nest-config
elif [[ "$OSTYPE" == "darwin"* ]]; then
cp "${CONDA_PREFIX}"/bin/nest-config "${CONDA_PREFIX}"/bin/nest-config-"${now}".orig
sed -i'.bac' "s|${COMPILER_FULL}|${COMPILER}|g" "${CONDA_PREFIX}"/bin/nest-config
sed -i'.bac' "s|-fopenmp=libomp|-Xclang -fopenmp|g" "${CONDA_PREFIX}"/bin/nest-config
sed -E -i'.bac' "s|\/home.*\/_build_env|${CONDA_PREFIX}|g" "${CONDA_PREFIX}"/bin/nest-config
else
echo $OSTYPE
fi

0 comments on commit f3b168b

Please sign in to comment.