Skip to content

Commit 768ceb0

Browse files
committed
CI: Dereference EXTRA_PIP_FLAGS
1 parent 0411c25 commit 768ceb0

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
python-version: 3.8
3434
architecture: x64
3535
install: archive
36-
pip-flags: $PRE_PIP_FLAGS
36+
pip-flags: PRE_PIP_FLAGS
3737
exclude:
3838
- os: ubuntu-latest
3939
architecture: x86
@@ -46,8 +46,7 @@ jobs:
4646
INSTALL_TYPE: ${{ matrix.install }}
4747
CHECK_TYPE: 'test'
4848
EXTRA_PIP_FLAGS: ${{ matrix.pip-flags }}
49-
NIGHTLY_WHEELS: 'https://pypi.anaconda.org/scipy-wheels-nightly/simple'
50-
PRE_PIP_FLAGS: '--pre --extra-index-url $NIGHTLY_WHEELS'
49+
PRE_PIP_FLAGS: '--pre --extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple'
5150

5251
steps:
5352
- uses: actions/checkout@v2

tools/ci/install.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ echo EXTRA_PIP_FLAGS = $EXTRA_PIP_FLAGS
1313

1414
set -x
1515

16+
if [ -n "$EXTRA_PIP_FLAGS" ]; then
17+
EXTRA_PIP_FLAGS=${!EXTRA_PIP_FLAGS}
18+
fi
19+
1620
if [ "$INSTALL_TYPE" == "setup" ]; then
1721
python setup.py install
1822
else

tools/ci/install_dependencies.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@ echo DEPENDS = $DEPENDS
1212

1313
set -x
1414

15+
if [ -n "$EXTRA_PIP_FLAGS" ]; then
16+
EXTRA_PIP_FLAGS=${!EXTRA_PIP_FLAGS}
17+
fi
18+
1519
if [ -n "$DEPENDS" ]; then
16-
pip install $EXTRA_PIP_FLAGS $DEPENDS
17-
pip install $EXTRA_PIP_FLAGS $OPTIONAL_DEPENDS || true
20+
pip install ${EXTRA_PIP_FLAGS} $DEPENDS
21+
pip install ${EXTRA_PIP_FLAGS} $OPTIONAL_DEPENDS || true
1822
fi
1923

2024
set +eux

0 commit comments

Comments
 (0)