From 39ed51cf7b81a8cee2fd19f6d3356e0fcdaebba5 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Fri, 12 Aug 2022 15:48:50 -0700 Subject: [PATCH 1/6] special init.py --- opensim/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensim/meta.yaml b/opensim/meta.yaml index ea0bad9..39a7ce0 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -6,7 +6,7 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: branch_4.4 + git_rev: branch_4.4_conda build: number: 2 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets From 5e4d9e4e8e2d39c7080dc8fedf53580eff07a024 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 5 Oct 2022 09:46:51 -0700 Subject: [PATCH 2/6] incorporate changes by Anthony regarding specifying python, numpy versions for dependency spec. --- opensim/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 39a7ce0..ec98e30 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -15,7 +15,7 @@ build: # NOTE : This is needed to ensure the paths to Simbody's binaries, like # simbody-visualizer, are corrected. detect_binary_files_with_prefix: true - string: py{{ CONDA_PY }}np{{ CONDA_NPY }} + # string: py{{ CONDA_PY }}np{{ CONDA_NPY }} requirements: host: - openblas # [not win] @@ -32,8 +32,8 @@ requirements: - make # [not win] run: - - python - - numpy + - python = {{ python }} + - numpy >= {{ numpy }} - freeglut # [win] - openblas # [not win] From 67cfb70ddff63f952cfe1918179bfc08582672bb Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 5 Oct 2022 09:59:43 -0700 Subject: [PATCH 3/6] Update continuous_integration.yml force build on push to master --- .github/workflows/continuous_integration.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index c8e18cc..a12c8a8 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -8,7 +8,9 @@ on: pull_request: branches: - '*' - + push: + branches: + - master jobs: windows37: runs-on: windows-2019 From 8fe423ab38704106b295c7dbfb6f48100dfff131 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 5 Oct 2022 10:02:32 -0700 Subject: [PATCH 4/6] Update text of README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2ff896a..e59ecd8 100644 --- a/README.md +++ b/README.md @@ -7,3 +7,4 @@ Usage: conda build opensim Only python 3 is supported. Default settings/package doesn't include Moco +master branch builds the latest released public version of the conda packages From 762998694454fb26d083874bdf4cedebc386abf2 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 5 Oct 2022 10:24:08 -0700 Subject: [PATCH 5/6] Update meta.yaml Fix syntax --- opensim/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opensim/meta.yaml b/opensim/meta.yaml index ec98e30..bd24b0a 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -32,8 +32,8 @@ requirements: - make # [not win] run: - - python = {{ python }} - - numpy >= {{ numpy }} + - python {{ python }} + - numpy {{ numpy }} - freeglut # [win] - openblas # [not win] From 07bcd32f84a3164d4e6c223a2d867e9a4621d7f4 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 5 Oct 2022 15:20:07 -0700 Subject: [PATCH 6/6] Update meta.yaml Restore string/name so that artifact can be identified and uploaded --- opensim/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensim/meta.yaml b/opensim/meta.yaml index bd24b0a..0024094 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -15,7 +15,7 @@ build: # NOTE : This is needed to ensure the paths to Simbody's binaries, like # simbody-visualizer, are corrected. detect_binary_files_with_prefix: true - # string: py{{ CONDA_PY }}np{{ CONDA_NPY }} + string: py{{ CONDA_PY }}np{{ CONDA_NPY }} requirements: host: - openblas # [not win]