epsi
/
msspec_python3
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Fix bug in Jenkinsfile. 

The PYTHONPATH variable is passed in the stage steps to tell Python where
to find the msspec package.
This commit is contained in:
Sylvain Tricot 2019-12-06 13:43:31 +01:00
parent c22f86fe76
commit c5187e3c4b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -10,12 +10,12 @@ pipeline {
stage('Build the code and generate tests results...') { stage('Build the code and generate tests results...') {
steps { steps {
sh '. ./ci_venv/bin/activate && make -C src results VERBOSE=1' sh '. ./ci_venv/bin/activate && make -C src results VERBOSE=1 PYTHONPATH=$PWD/src'
} }
} }
stage('Create a setup file...') { stage('Create a setup file...') {
steps { steps {
sh '. ~/.profile && make selfex VERBOSE=1' sh '. ~/.profile && make selfex VERBOSE=1 PYTHONPATH=$PWD/src'
} }
} }
stage('Test installation...') { stage('Test installation...') {

9
src/msspec/phagen/fortran/Makefile
View File

@ -17,13 +17,12 @@ endif
.PHONY: clean .PHONY: clean
pybinding: libphagen pybinding: libphagen.target
libphagen: $(objects) main.f libphagen.target: $(objects) main.f
@echo "building Python binding..." @echo "building Python binding..."
@$(F2PY) -I. $(objects) $(F2PY_OPTS)-c -m libphagen main.f @$(F2PY) -I. $(objects) $(F2PY_OPTS)-c -m libphagen main.f
# @cp libphagen.cpython*.so ../ @touch $@
# @mv libphagen.cpython*.so libphagen.so
$(objects): $(objects_src) $(objects): $(objects_src)
@echo "compiling subroutines and functions for phagen..." @echo "compiling subroutines and functions for phagen..."
@ -32,3 +31,5 @@ $(objects): $(objects_src)
clean: clean:
@echo "cleaning..." @echo "cleaning..."
@rm -rf *.o *.mod @rm -rf *.o *.mod
@rm -rf $(objects)
@rm -f libphagen.target