From 055ea49eff64633417d1ab1f2ac96f59adff6cc2 Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Sun, 11 Sep 2016 08:57:05 +0100 Subject: [PATCH 1/4] numpy update test travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 25053a90d..5e508ed96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ compiler: addons: apt: packages: - - python3 + - python3-numpy script: - echo "CXX="$CXX - echo "CC="$CC From 6a9d2d60842a2e20b88dcadf139b59e7c992a743 Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Sun, 11 Sep 2016 10:10:25 +0100 Subject: [PATCH 2/4] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 55af07e56..42a1c32fe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,8 +2,8 @@ build: project: build3/vs2010/0_Bullet3Solution.sln build_script: - - mkdir cmake - - cd cmake + - mkdir cm + - cd cm - cmake .. -G"Visual Studio 14 2015 Win64" - cmake --build . --target ALL_BUILD --config Release -- /maxcpucount:4 /verbosity:quiet From c093c04be00b297c92fc2422ddb903d8ddc39faf Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Sun, 11 Sep 2016 10:37:23 +0100 Subject: [PATCH 3/4] Update .travis.yml --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5e508ed96..d85803ab1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,10 @@ addons: apt: packages: - python3-numpy + +install: + - pip install numpy + script: - echo "CXX="$CXX - echo "CC="$CC From 18ef164e7ccf0dfddc420e20e2bad576e4cd086d Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Sun, 11 Sep 2016 10:47:00 +0100 Subject: [PATCH 4/4] revert numpy test/travis.yml --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d85803ab1..d2ad176f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,8 @@ compiler: addons: apt: packages: - - python3-numpy - -install: - - pip install numpy - + - python3 + script: - echo "CXX="$CXX - echo "CC="$CC