Skip to content

Commit 4bd581b

Browse files
committed
Merge remote-tracking branch 'skeleton/main' into main
2 parents 9cd3f75 + 4dc2521 commit 4bd581b

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

configure

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,19 @@ CFG_ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
5252
CFG_BIN_DIR=$CFG_ROOT_DIR/$VIRTUALENV_DIR/bin
5353

5454

55+
################################
56+
# Install with or without and index. With "--no-index" this is using only local wheels
57+
# This is an offline mode with no index and no network operations
58+
# NO_INDEX="--no-index "
59+
NO_INDEX=""
60+
61+
5562
################################
5663
# Thirdparty package locations and index handling
57-
# Find packages from the local thirdparty directory
58-
if [ -d "$CFG_ROOT_DIR/thirdparty" ]; then
59-
PIP_EXTRA_ARGS="--find-links $CFG_ROOT_DIR/thirdparty"
64+
# Find packages from the local thirdparty directory if present
65+
THIRDPARDIR=$CFG_ROOT_DIR/thirdparty
66+
if [[ "$(echo $THIRDPARDIR/*.whl)x" != "$THIRDPARDIR/*.whlx" ]]; then
67+
PIP_EXTRA_ARGS="$NO_INDEX --find-links $THIRDPARDIR"
6068
fi
6169

6270

@@ -182,6 +190,7 @@ while getopts :-: optchar; do
182190
esac
183191
done
184192

193+
185194
PIP_EXTRA_ARGS="$PIP_EXTRA_ARGS"
186195

187196
find_python

etc/scripts/utils_thirdparty.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,6 +1678,7 @@ def get_package_version(self, name, version=None):
16781678
"""
16791679
if not version:
16801680
versions = list(self._get_package_versions_map(name).values())
1681+
# return the latest version
16811682
return versions and versions[-1]
16821683
else:
16831684
return self._get_package_versions_map(name).get(version)

0 commit comments

Comments
 (0)