Skip to content

Commit fa13562

Browse files
authored
Merge pull request #32 from nexB/install-from-thirdparty-dir
Check for deps in local thirdparty directory #31
2 parents b735a3f + 77ce5e4 commit fa13562

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

configure

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -e
1111
#set -x
1212

1313
################################
14-
# A configuration script to set things up:
14+
# A configuration script to set things up:
1515
# create a virtualenv and install or update thirdparty packages.
1616
# Source this script for initial configuration
1717
# Use configure --help for details
@@ -50,9 +50,11 @@ VIRTUALENV_PYZ_URL=https://bootstrap.pypa.io/virtualenv.pyz
5050
CFG_ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
5151
CFG_BIN_DIR=$CFG_ROOT_DIR/$VIRTUALENV_DIR/bin
5252

53+
# Find packages from the local thirdparty directory or from pypi
54+
PIP_EXTRA_ARGS="--find-links $CFG_ROOT_DIR/thirdparty"
5355

5456
################################
55-
# Set the quiet flag to empty if not defined
57+
# Set the quiet flag to empty if not defined
5658
if [[ "$CFG_QUIET" == "" ]]; then
5759
CFG_QUIET=" "
5860
fi
@@ -63,7 +65,7 @@ fi
6365
# Use environment variables or a file if available.
6466
# Otherwise the latest Python by default.
6567
if [[ "$PYTHON_EXECUTABLE" == "" ]]; then
66-
# check for a file named PYTHON_EXECUTABLE
68+
# check for a file named PYTHON_EXECUTABLE
6769
if [ -f "$CFG_ROOT_DIR/PYTHON_EXECUTABLE" ]; then
6870
PYTHON_EXECUTABLE=$(cat "$CFG_ROOT_DIR/PYTHON_EXECUTABLE")
6971
else

configure.bat

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ set CFG_ROOT_DIR=%~dp0
4747
set "CFG_BIN_DIR=%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts"
4848

4949

50+
@rem ################################
51+
@rem # Thirdparty package locations and index handling
52+
set "PIP_EXTRA_ARGS=--find-links %CFG_ROOT_DIR%\thirdparty"
53+
@rem ################################
54+
55+
5056
@rem ################################
5157
@rem # Set the quiet flag to empty if not defined
5258
if not defined CFG_QUIET (

thirdparty/README.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Put your Python dependency wheels to be vendored in this directory.
2+

0 commit comments

Comments
 (0)