Skip to content

Commit a56298e

Browse files
committed
Fix merge issues and update wheel names to reflect python 3.11
1 parent 6b0e844 commit a56298e

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

.github/workflows/continuous_integration.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
4848
- name: Install SWIG
4949
run: |
50-
choco install swig --version 4.2.0 --yes --limit-output --allow-downgrade
50+
choco install swig --version 4.1.1 --yes --limit-output --allow-downgrade
5151
swig -swiglib
5252
5353
- name: Cache dependencies
@@ -118,12 +118,10 @@ jobs:
118118
- name: Upload windows wheel
119119
uses: actions/upload-artifact@v4
120120
with:
121-
name: opensim-4.5.2-cp310-cp310-win_amd64.whl
122-
path: ~/opensim-core-install/sdk/python/dist/opensim-4.5.2-cp310-cp310-win_amd64.whl
123-
124-
125-
# # Run python tests.
126-
# python -m unittest discover --start-directory opensim/tests --verbose
121+
name: opensim-4.5.2-cp311-cp311-win_amd64.whl
122+
path: ~/opensim-core-install/sdk/python/dist/opensim-4.5.2-cp311-cp311-win_amd64.whl
123+
# Run python tests.
124+
python -m unittest discover --start-directory opensim/tests --verbose
127125

128126
- name: Upload opensim-core
129127
uses: actions/upload-artifact@v4
@@ -382,8 +380,8 @@ jobs:
382380
- name: Upload osx wheel
383381
uses: actions/upload-artifact@v4
384382
with:
385-
name: opensim-4.5.2-cp310-cp310-macosx_15_0_universal2.whl
386-
path: /Users/runner/work/opensim-core/opensim-core-install/sdk/python/dist/opensim-4.5.2-cp310-cp310-macosx_15_0_universal2.whl
383+
name: opensim-4.5.2-cp311-cp311-macosx_15_0_universal2.whl
384+
path: /Users/runner/work/opensim-core/opensim-core-install/sdk/python/dist/opensim-4.5.2-cp311-cp311-macosx_15_0_universal2.whl
387385

388386
- name: Test Python bindings
389387
run: |
@@ -630,20 +628,20 @@ jobs:
630628
631629
- name: Build wheel
632630
run: |
633-
cd $GITHUB_WORKSPACE/../opensim-core-install/lib/python3.10/site-packages
631+
cd $GITHUB_WORKSPACE/../opensim-core-install/lib/python3.11/site-packages
634632
python3 -m build --wheel
635633
636634
- name: Upload linux wheel
637635
uses: actions/upload-artifact@v4
638636
with:
639-
name: opensim-4.5.2-cp310-cp310-linux_x86_64.whl
640-
path: /home/runner/work/opensim-core/opensim-core-install/lib/python3.10/site-packages/dist/opensim-4.5.2-cp310-cp310-linux_x86_64.whl
637+
name: opensim-4.5.2-cp311-cp311-linux_x86_64.whl
638+
path: /home/runner/work/opensim-core/opensim-core-install/lib/python3.11/site-packages/dist/opensim-4.5.2-cp311-cp311-linux_x86_64.whl
641639

642640
- name: Test Python bindings
643641
run: |
644-
pip install /home/runner/work/opensim-core/opensim-core-install/lib/python3.10/site-packages/dist/opensim-4.5.2-cp310-cp310-linux_x86_64.whl
642+
pip install /home/runner/work/opensim-core/opensim-core-install/lib/python3.11/site-packages/dist/opensim-4.5.2-cp311-cp311-linux_x86_64.whl
645643
# Run the python tests, verbosely
646-
python3 -m unittest discover --start-directory /home/runner/work/opensim-core/opensim-core-install/lib/python3.10/site-packages/opensim/tests --verbose
644+
python3 -m unittest discover --start-directory /home/runner/work/opensim-core/opensim-core-install/lib/python3.11/site-packages/opensim/tests --verbose
647645
648646
- name: Upload opensim-core
649647
uses: actions/upload-artifact@v4

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ project(OpenSim)
1313
if(COMMAND cmake_policy)
1414
cmake_policy(SET CMP0003 NEW)
1515
cmake_policy(SET CMP0005 NEW)
16-
cmake_policy(SET CMP0177 NEW)
16+
# cmake_policy(SET CMP0177 NEW)
1717
endif(COMMAND cmake_policy)
1818

1919
message(STATUS "NOTICE: Make sure all OpenSim dependencies are built with the \

0 commit comments

Comments
 (0)