From befd37187442b67de5702f34ce179c757b1c732c Mon Sep 17 00:00:00 2001
From: 0u812 <0u812@users.noreply.github.com>
Date: Wed, 20 Jan 2016 12:52:17 -0800
Subject: [PATCH 1/3] always copy dlls to site-packages on windows
---
wrappers/Python/setup.py | 37 ++++++++++++++++++-------------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/wrappers/Python/setup.py b/wrappers/Python/setup.py
index 8d3d5188f0..144114f703 100644
--- a/wrappers/Python/setup.py
+++ b/wrappers/Python/setup.py
@@ -47,8 +47,8 @@ def _checkRequirements():
# get the os string
def _getOSString():
-
-
+
+
s = platform.system().lower()
unix = False
@@ -65,7 +65,7 @@ def _getOSString():
.format(s))
arch = platform.architecture()
-
+
if unix and arch[0].startswith('64'):
arch = 'x86_64'
elif unix and arch[0].startswith('32'):
@@ -74,7 +74,7 @@ def _getOSString():
arch = '32' #win 32
return s + "_" + arch
-
+
_version = _version + "-" + _getOSString()
@@ -86,7 +86,7 @@ def _copyDistFiles():
if platform.system().lower().startswith("win"):
print("copying windows dlls...")
-
+
shutil.copyfile("bin/iconv.dll", "site-packages/roadrunner/iconv.dll")
shutil.copyfile("bin/msvcp120.dll", "site-packages/roadrunner/msvcp120.dll")
shutil.copyfile("bin/msvcr120.dll", "site-packages/roadrunner/msvcr120.dll")
@@ -96,9 +96,9 @@ def _copyDistFiles():
import glob
for f in glob.glob("*.txt"):
shutil.copyfile(f, "site-packages/roadrunner/" + f)
-
-
-
+
+
+
# custom sdist command to copy different bits
@@ -128,7 +128,7 @@ def setup(*args):
_checkRequirements()
- # may be running in a different dir, temp change dir into
+ # may be running in a different dir, temp change dir into
# dir of setup file
curdir = os.path.abspath(os.getcwd())
@@ -137,9 +137,11 @@ def setup(*args):
# copy stuff if we are building
- if len(args) > 0 and args[0].lower().find('dist') >= 0:
- print ("we're building...")
- _copyDistFiles()
+ # if len(args) > 0 and args[0].lower().find('dist') >= 0:
+ # print ("we're building...")
+ # _copyDistFiles()
+ # always copy windows dlls
+ _copyDistFiles()
# check if we are running in Mac Spyder, and /Users/andy/local/dist/pylibroadrunner-1.1.1-macosx_x86_64/setup.py
# called with no args
@@ -164,11 +166,11 @@ def setup(*args):
},
package_data={
# add dll, won't hurt unix, not there anyway
- "roadrunner" : ["_roadrunner." + _sharedLibExt(), "*.dll", "*.txt" ],
+ "roadrunner" : ["_roadrunner." + _sharedLibExt(), "*.dll", "*.txt" ],
"roadrunner.testing" : ["*.xml", "*.txt", "*.dat", "dsmts/*.xml", "dsmts/*.csv", "test_data/*"]
},
cmdclass={'sdist' : _RoadRunnerSDist},
-
+
# fake out the command line args
script_name = 'setup.py',
script_args = args
@@ -178,12 +180,9 @@ def setup(*args):
print("changeing back to " + curdir)
os.chdir(curdir)
-
-
+
+
if __name__ == "__main__":
args = sys.argv[1:]
setup(*args)
-
-
-
From a67ef8b3fed0a41c597f3a84d583da347608f859 Mon Sep 17 00:00:00 2001
From: Kyle Medley <0u812@users.noreply.github.com>
Date: Wed, 20 Jan 2016 13:13:56 -0800
Subject: [PATCH 2/3] Update README.md
Edited readme [ci skip]
---
README.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/README.md b/README.md
index 9c6508c1a6..1b43a72dea 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,10 @@ E. T. Somogyi 1, M. T. Karlsson 2, M. Swat 1, M
libRoadRunner is a high performance and portable simulation engine for systems and synthetic biology.
+## Contributing
+
+**IMPORTANT!** Contributers **must** follow the [contribution guidelines](https://github.com/sys-bio/roadrunner/wiki). Contibuters are responsible for complying with the guidelines, including (but not limited to) making commits to the correct branch. Maintainers are not responsible for changes made to the wrong branch. Contributers take full responsibility for ensuring that their changes get merged into the develop branch.
+
## libRoadRunner supports the following features:
* Time Dependent Simulation (with optional conservation law reduction) using CVODE
From 70edb65b1226c1a1913d371f02b52549ba8f4ee6 Mon Sep 17 00:00:00 2001
From: Kyle Medley <0u812@users.noreply.github.com>
Date: Wed, 20 Jan 2016 13:15:17 -0800
Subject: [PATCH 3/3] Update README.md
fix typo [ci skip]
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 1b43a72dea..b53657dda2 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ libRoadRunner is a high performance and portable simulation engine for systems a
## Contributing
-**IMPORTANT!** Contributers **must** follow the [contribution guidelines](https://github.com/sys-bio/roadrunner/wiki). Contibuters are responsible for complying with the guidelines, including (but not limited to) making commits to the correct branch. Maintainers are not responsible for changes made to the wrong branch. Contributers take full responsibility for ensuring that their changes get merged into the develop branch.
+**IMPORTANT!** Contributors **must** follow the [contribution guidelines](https://github.com/sys-bio/roadrunner/wiki). Contibuters are responsible for complying with the guidelines, including (but not limited to) making commits to the correct branch. Maintainers are not responsible for changes made to the wrong branch. Contributors take full responsibility for ensuring that their changes get merged into the develop branch.
## libRoadRunner supports the following features: