Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
f937e1f7
Commit
f937e1f7
authored
Jun 11, 2016
by
Matthew Brett
Browse files
More attempts at fixing dependencies
parent
45db494c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
6 deletions
+7
-6
.travis.yml
.travis.yml
+1
-1
manylinux
manylinux
+1
-1
travis_linux_steps.sh
travis_linux_steps.sh
+1
-1
travis_osx_steps.sh
travis_osx_steps.sh
+1
-1
travis_steps.sh
travis_steps.sh
+3
-2
No files found.
.travis.yml
View file @
f937e1f7
...
@@ -2,7 +2,7 @@ env:
...
@@ -2,7 +2,7 @@ env:
global
:
global
:
-
REPO_DIR=tornado
-
REPO_DIR=tornado
-
BUILD_COMMIT=v4.3.0
-
BUILD_COMMIT=v4.3.0
-
BUILD_DEPENDS=
tornado
-
BUILD_DEPENDS=
-
TEST_DEPENDS=
-
TEST_DEPENDS=
sudo
:
required
sudo
:
required
...
...
manylinux
@
061dc2f9
Compare
3fe49174
...
061dc2f9
Subproject commit
3fe491741fef631e6236a30d4502eaa289b510a9
Subproject commit
061dc2f9001caf621a348c134fba4674048e08e8
travis_linux_steps.sh
View file @
f937e1f7
#!/bin/bash
#!/bin/bash
# Travis steps for Linux
# Travis steps for Linux
set
-e
set
-e
x
BUILD_SCRIPT
=
${
BUILD_SCRIPT
:-
/io/manylinux/build_package.sh
}
BUILD_SCRIPT
=
${
BUILD_SCRIPT
:-
/io/manylinux/build_package.sh
}
...
...
travis_osx_steps.sh
View file @
f937e1f7
...
@@ -26,7 +26,7 @@ function build_wheels {
...
@@ -26,7 +26,7 @@ function build_wheels {
git fetch origin
git fetch origin
git checkout
$BUILD_COMMIT
git checkout
$BUILD_COMMIT
git clean
-fxd
git clean
-fxd
pip
install
$BUILD_DEPENDS
if
[
-n
"
$BUILD_DEPENDS
"
]
;
then
pip
install
$BUILD_DEPENDS
;
fi
pip wheel
-w
$WHEELHOUSE
--no-deps
.
pip wheel
-w
$WHEELHOUSE
--no-deps
.
cd
..
cd
..
pip
install
delocate
pip
install
delocate
...
...
travis_steps.sh
View file @
f937e1f7
#!/bin/bash
#!/bin/bash
WHEELHOUSE
=
$PWD
/wheelhouse
WHEELHOUSE
=
$PWD
/wheelhouse
if
[
!
-d
$WHEELHOUSE
]
;
then
mkdir
wheelhouse
;
fi
if
[
!
-d
$WHEELHOUSE
]
;
then
mkdir
wheelhouse
;
fi
PKG_NAME
=
${
PKG_NAME
:-
$REPO_DIR
}
if
[[
"
$TRAVIS_OS_NAME
"
==
"osx"
]]
;
then
if
[[
"
$TRAVIS_OS_NAME
"
==
"osx"
]]
;
then
source
travis_osx_steps.sh
source
travis_osx_steps.sh
whl_tail
=
"*.whl"
else
else
source
travis_linux_steps.sh
source
travis_linux_steps.sh
whl_tail
=
"*manylinux1_x86_64.whl"
fi
fi
function
install_wheel
{
function
install_wheel
{
if
[
-n
"
$TEST_DEPENDS
"
]
;
then
pip
install
$TEST_DEPENDS
;
fi
if
[
-n
"
$TEST_DEPENDS
"
]
;
then
pip
install
$TEST_DEPENDS
;
fi
pip
install
-f
$WHEELHOUSE
--no-index
$PKG_NAME
pip
install
$WHEELHOUSE
/
$whl_tail
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment