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

Jump to bottom

Introduce OPENSIM_PYTHON_CONDA #2989

Merged
merged 21 commits into from
Feb 17, 2022
Merged

Introduce OPENSIM_PYTHON_CONDA #2989

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dbde455
Introduce OPENSIM_PYTHON_CONDA to disable copying/duplicating runtime…
aymanhab Apr 15, 2021
c606982
Merge branch 'master' into support_conda_build
aymanhab Feb 3, 2022
4fb99b9
Merge branch 'master' into support_conda_build
aymanhab Feb 7, 2022
bd523ef
Use more modern find_package Python3 so that Numpy is found along wit…
aymanhab Feb 8, 2022
8079462
Merge branch 'support_conda_build' of https://github.com/opensim-org/…
aymanhab Feb 8, 2022
4528858
Require CMake 3.15 to enable use of Python3 and Numpy using CMake fac…
aymanhab Feb 8, 2022
cac017d
Reduce required python version to 3.6 and remove need for development…
aymanhab Feb 8, 2022
d3a0141
Update continuous_integration.yml
aymanhab Feb 8, 2022
501c546
Update continuous_integration.yml
aymanhab Feb 8, 2022
ded951b
Add back Development to locate include paths
aymanhab Feb 8, 2022
1b8038e
Merge branch 'support_conda_build' of https://github.com/opensim-org/…
aymanhab Feb 8, 2022
9316479
Remove add_dll_directory in __init__.py
aymanhab Feb 9, 2022
6332a14
Use Python3 specific CMake variables throughout
aymanhab Feb 10, 2022
7ecd832
Update continuous_integration.yml
aymanhab Feb 10, 2022
ff3397c
Update continuous_integration.yml
aymanhab Feb 10, 2022
40cb705
Update continuous_integration.yml
aymanhab Feb 10, 2022
f723561
Remove stale line
aymanhab Feb 10, 2022
7fda7b7
Merge branch 'support_conda_build' of https://github.com/opensim-org/…
aymanhab Feb 10, 2022
9809d7b
modify comment in __init__.py
aymanhab Feb 16, 2022
7920a03
Restore __init__.py and separate python bindings tests
aymanhab Feb 17, 2022
e0e7dce
Change location of python package dependeing on CONDA layout
aymanhab Feb 17, 2022
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
Prev Previous commit
Next Next commit
Remove add_dll_directory in __init__.py
  • Loading branch information
@aymanhab
aymanhab committed Feb 9, 2022
commit 93164794c985faa496e92c8987ff394f58a69c0c
4 changes: 2 additions & 2 deletions Bindings/Python/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sys
import os
if (sys.version_info.major == 3 and sys.version_info.minor >= 8 and sys.platform.startswith('win')):
os.add_dll_directory(DLL_PATH)
# if (sys.version_info.major == 3 and sys.version_info.minor >= 8 and sys.platform.startswith('win')):
# os.add_dll_directory(DLL_PATH)

from .simbody import *
from .common import *
Expand Down