Skip to content

Commit 8fd04d8

Browse files
committed
Use unstable branch of cpp2py and update CI builds
1 parent 924350b commit 8fd04d8

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,13 @@ jobs:
8585
if: matrix.os == 'macos-12'
8686
run: |
8787
brew install ccache gcc@12 llvm boost fftw hdf5 open-mpi openblas
88-
pip3 install mako numpy scipy mpi4py
89-
pip3 install -r requirements.txt
88+
mkdir $HOME/.venv
89+
python3 -m venv $HOME/.venv/my_python
90+
source $HOME/.venv/my_python/bin/activate
91+
pip install mako numpy scipy mpi4py
92+
pip install -r requirements.txt
93+
echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> $GITHUB_ENV
94+
echo "PATH=$PATH" >> $GITHUB_ENV
9095
9196
- name: add clang cxxflags
9297
if: ${{ contains(matrix.cxx, 'clang') }}

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
8989
"LD_LIBRARY_PATH=$hdf5/lib",
9090
"PYTHONPATH=$installDir/lib/python3.9/site-packages",
9191
"CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs",
92+
"VIRTUAL_ENV=$venv",
9293
"OMP_NUM_THREADS=2"]) {
9394
deleteDir()
9495
/* note: this is installing into the parent (triqs) venv (install dir), which is thus shared among apps and so not be completely safe */

deps/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if(PythonSupport OR (NOT IS_SUBPROJECT AND Build_Documentation))
5252
external_dependency(Cpp2Py
5353
GIT_REPO https://github.com/TRIQS/cpp2py
5454
VERSION 2.0
55-
GIT_TAG master
55+
GIT_TAG unstable
5656
BUILD_ALWAYS
5757
EXCLUDE_FROM_ALL
5858
)

0 commit comments

Comments
 (0)