Skip to content

Commit

Permalink
Prune Python packages to install
Browse files Browse the repository at this point in the history
  • Loading branch information
robertodr committed Sep 2, 2018
1 parent ee2930e commit 72c8160
Show file tree
Hide file tree
Showing 10 changed files with 159 additions and 201 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ matrix:
sources:
- ubuntu-toolchain-r-test
packages:
- chrpath
- doxygen
- g++-7
- g++-mingw-w64
Expand Down
5 changes: 0 additions & 5 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,8 @@ cython = "*"
docopt = "*"
numpy = "*"
pathlib = "*"
pycodestyle = "*"
pyyaml = "*"
sphinx = "*"
sphinx-rtd-theme = "*"
sphinxcontrib-bibtex = "*"
typing = "*"


[dev-packages]

313 changes: 131 additions & 182 deletions Pipfile.lock

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions chapter-10/recipe-04/cxx-example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ install(
)

# patch RPATH of executable
if(UNIX)
set(PATCHING_SCRIPT "${CMAKE_CURRENT_LIST_DIR}/cmake/patch_rpath.py")
configure_file(cmake/patch_rpath.cmake.in patch_rpath.cmake @ONLY)
install(
SCRIPT
${CMAKE_CURRENT_BINARY_DIR}/patch_rpath.cmake
)
endif()
#if(UNIX)
# set(PATCHING_SCRIPT "${CMAKE_CURRENT_LIST_DIR}/cmake/patch_rpath.py")
# configure_file(cmake/patch_rpath.cmake.in patch_rpath.cmake @ONLY)
# install(
# SCRIPT
# ${CMAKE_CURRENT_BINARY_DIR}/patch_rpath.cmake
# )
#endif()
3 changes: 3 additions & 0 deletions chapter-10/recipe-04/cxx-example/cmake/patch_rpath.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ else()
OUTPUT_STRIP_TRAILING_WHITESPACE
)

message(STATUS "Standard output from patch_rpath.py: ${_out}")
message(STATUS "Standard error from patch_rpath.py: ${_err}")

if(_res EQUAL 0)
message(STATUS "RPATH for ${_elfobj} patched using ${_patcher}")
else()
Expand Down
3 changes: 3 additions & 0 deletions chapter-10/recipe-04/cxx-example/cmake/patch_rpath.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,11 @@ def main():
elif patcher == 'chrpath':
streamer('Using chrpath', end='\n')
old_rpath = run_command(command='{} --list {}'.format(patcher, elfobj))
streamer('FIRST {}'.format(old_rpath), end='\n')
old_rpath = old_rpath.replace('{}: RUNPATH='.format(elfobj), '')
streamer('SECOND {}'.format(old_rpath), end='\n')
new_rpath = old_rpath.replace(to_remove, to_add)
streamer('THIRD {}'.format(new_rpath), end='\n')
_ = run_command(command='{} --replace {} {}'.format(patcher, new_rpath, elfobj))
_ = run_command(command='{} --list {}'.format(patcher, elfobj))
elif patcher == 'install_tool_name':
Expand Down
4 changes: 2 additions & 2 deletions chapter-10/recipe-04/cxx-example/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ file(TO_NATIVE_PATH "${_rpath}/${CMAKE_INSTALL_LIBDIR}" use_message_RPATH)
set_target_properties(use_message
PROPERTIES
MACOSX_RPATH ON
SKIP_BUILD_RPATH OFF
SKIP_BUILD_RPATH ON
BUILD_WITH_INSTALL_RPATH OFF
INSTALL_RPATH "${use_message_RPATH}"
INSTALL_RPATH_USE_LINK_PATH ON
INSTALL_RPATH_USE_LINK_PATH OFF
)

install(
Expand Down
9 changes: 9 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
breathe
cffi
colorama
cython
docopt
numpy
pathlib
pyyaml
sphinx
5 changes: 3 additions & 2 deletions testing/collect_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@

import colorama
import docopt
from packaging import version

from env import (die_hard, get_buildflags, get_ci_environment, get_generator,
verbose_output)
from packaging import version
from parse import extract_menu_file


Expand Down Expand Up @@ -234,6 +233,8 @@ def main(arguments):

# glob recipes
recipes = [r for r in sorted(topdir.glob(arguments['<regex>']))]
if not recipes:
raise RuntimeError('Empty list of recipes to test: provide a valid regex')

# Set NINJA_STATUS environment variable
os.environ['NINJA_STATUS'] = '[Built edge %f of %t in %e sec]'
Expand Down
1 change: 0 additions & 1 deletion testing/dependencies/travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew install mingw-w64
brew install mpich
brew install ossp-uuid
brew install patchelf
brew install pipenv
brew install pkg-config
brew install zeromq
Expand Down

0 comments on commit 72c8160

Please sign in to comment.