Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
steffengraber committed Jan 10, 2024
2 parents d930293 + 3df4f41 commit 177a5e0
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 10 deletions.
9 changes: 9 additions & 0 deletions .ci_support/migrations/hdf51142.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
__migrator:
build_number: 1
kind: version
migration_number: 1
# HDF5 1.14.2 and HDF5 1.14.3 are ABI compatible as
# as such we decided to keep the same migration file
hdf5:
- 1.14.3
migrator_ts: 1692590899.44706
14 changes: 12 additions & 2 deletions .gitignore

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

12 changes: 5 additions & 7 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
azure:
store_build_artifacts: true
build_platform:
osx_arm64: osx_64
build_with_mambabuild: true
conda_build:
pkg_format: '2'
conda_forge_output_validation: true
github:
branch_name: main
tooling_branch_name: main
test: native_and_emulated
conda_build:
pkg_format: '2'
azure:
store_build_artifacts: True
build_with_mambabuild:
True

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "nest-simulator" %}
{% set version = "3.6" %}
{% set build = 2 %}
{% set build = 3 %}

package:
name: {{ name|lower }}
Expand Down

0 comments on commit 177a5e0

Please sign in to comment.