Skip to content

Gs/remove tmp dir builds #2

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Gs/remove tmp dir builds #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ddc72a6
Do not call pip build wheel as it copies all the files to the tmp dir…
sergregory Jan 19, 2021
9c87411
Install build dependencies as setup.py does not install them automati…
sergregory Jan 19, 2021
8d50f9d
Do not print compiler warnings
sergregory Jan 19, 2021
6501e39
Add missed numpy
sergregory Jan 19, 2021
e073641
Switch osx build to ninja
sergregory Jan 19, 2021
1f6d21b
Install exactly the same version of the pip as tests use
sergregory Jan 19, 2021
cac29e3
Use shared cache name for all osx builds
sergregory Jan 19, 2021
dcefc70
Rollback cache name change - it is not needed, as it is not used in o…
sergregory Jan 19, 2021
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
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def main():
ci_cmake_generator = (
["-G", "Visual Studio 14" + (" Win64" if x64 else "")]
if os.name == "nt"
else ["-G", "Unix Makefiles"]
else ["-G", "Ninja"]
)

cmake_args = (
Expand Down
6 changes: 4 additions & 2 deletions travis_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ function bdist_wheel_cmd {
# copied from multibuild's common_utils.sh
# add osx deployment target so it doesnt default to 10.6
local abs_wheelhouse=$1
CI_BUILD=1 pip wheel --verbose --wheel-dir="$PWD/dist" . $BDIST_PARAMS
pip3 install --upgrade scikit-build setuptools wheel cmake pip ${TEST_DEPENDS}
CI_BUILD=1 CXXFLAGS="-w" python3 setup.py --verbose bdist_wheel --dist-dir="$PWD/dist" $BDIST_PARAMS
cp dist/*.whl $abs_wheelhouse
if [ -z "$IS_OSX" ]; then
TOOLS_PATH=/opt/_internal/tools
Expand Down Expand Up @@ -113,10 +114,11 @@ function pre_build {
brew unlink python@2
generate_ffmpeg_formula
brew install ffmpeg_opencv
brew install ninja
fi

# echo 'Installing qt5'

# if [ -n "$CACHE_STAGE" ]; then
# echo "Qt5 has bottle, no caching needed"
# else
Expand Down