Skip to content

Commit f991ce6

Browse files
committed
ci(python) no --user in venv; install wheel
1 parent 62f828b commit f991ce6

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ add_custom_target(python-wheel
5555

5656
add_custom_target(python-sdist
5757
COMMENT "Creating sdist for AMICI base python package"
58-
COMMAND ${PYTHON_EXECUTABLE} setup.py sdist --dist-dir=${CMAKE_BINARY_DIR}
58+
COMMAND ${PYTHON_EXECUTABLE} setup.py sdist --dist-dir=${CMAKE_CURRENT_BINARY_DIR}
5959
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sdist
6060
)
6161

scripts/buildAmici.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ make
1818
#pip3 install --user --prefix= `ls -t ${AMICI_PATH}/build/python/amici-*.whl | head -1`
1919

2020
make python-sdist
21-
21+
set -x
2222
python3 -m venv ${AMICI_PATH}/build/venv --clear
2323
source ${AMICI_PATH}/build/venv/bin/activate
24-
pip3 install --user pkgconfig
25-
pip3 install `ls -t ${AMICI_PATH}/build/python/amici-*.tar.gz | head -1`
24+
pip3 install --upgrade pip
25+
pip3 install pkgconfig wheel
26+
pip3 install --verbose `ls -t ${AMICI_PATH}/build/python/amici-*.tar.gz | head -1`

scripts/run-python-tests.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ AMICI_PATH="`( cd \"$AMICI_PATH/..\" && pwd )`"
77
set -e
88
cd ${AMICI_PATH}/tests
99
source ${AMICI_PATH}/build/venv/bin/activate
10-
pip3 install --upgrade pip
11-
pip3 install --user scipy h5py
10+
pip3 install scipy h5py
1211
python3 testModels.py

0 commit comments

Comments
 (0)