Use "pip install" instead of "python setup.py install"

Add python3-pip as build dependency

Author: stephankramer

.github/workflows/ubuntu.yml

@@ -22,7 +22,7 @@ jobs:
         run: | 
           echo "Europe/London" > /etc/timezone
           apt-get -y update
-          DEBIAN_FRONTEND=noninteractive apt-get -y install gfortran g++ python3-setuptools python3-all-dev debhelper dh-python texlive python3-junit.xml
+          DEBIAN_FRONTEND=noninteractive apt-get -y install gfortran g++ python3-setuptools python3-pip python3-all-dev debhelper dh-python texlive python3-junit.xml
 
       - name: Configuring
         run: ./configure --prefix=/tmp

Makefile.in

@@ -51,7 +51,7 @@ VPATH = src/
 .cpp.lo:
 	./libtool --mode=compile --tag=CXX $(CXX) $(CXXFLAGS) -c $<
 
-default: libspud.la build-diamond
+default: libspud.la build-diamond build-pyspud
 
 libspud.la: $(OBJS)
 	./libtool --mode=link --tag=FC $(FC) $(FCFLAGS) -o $(LIB) $(OBJS) $(LIBS) -rpath @prefix@/lib 
@@ -61,6 +61,9 @@ libspud.la: $(OBJS)
 build-diamond:
 	cd diamond; python3 setup.py build; cd ..
 
+build-pyspud: libspud.la
+	cd python; python3 setup.py build; cd ..
+
 test: unittest
 
 unittest: libspud.la
@@ -95,13 +98,13 @@ install-spudtools:
 	@INSTALL@ -m644 schema/spud_base.rng $(DESTDIR)@prefix@/share/spud
 
 install-diamond:
-	cd diamond; python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
+	python3 -mpip install --prefix=$(DESTDIR)@prefix@ diamond/
 
 install-pyspud:
-	cd python; python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
+	python3 -mpip install --prefix=$(DESTDIR)@prefix@ python/
 
 install-dxdiff:
-	cd dxdiff; python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
+	python3 -mpip install --prefix=$(DESTDIR)@prefix@ dxdiff/
 
 clean:
 	@cd doc; $(MAKE) clean

debian/control

@@ -3,7 +3,7 @@ Maintainer: The ICOM team <patrick.farrell@imperial.ac.uk>
 Uploaders: David Ham <david.ham@imperial.ac.uk>
 Section: science
 Priority: optional
-Build-Depends: gfortran (>=4.2), g++ (>=4.2), python3-setuptools (>= 39), python3-all-dev (>= 2.3.5-11), debhelper (>= 5.0.38), dh-python, texlive
+Build-Depends: gfortran (>=4.2), g++ (>=4.2), python3-setuptools (>= 39), python3-pip, python3-all-dev , debhelper (>= 5.0.38), dh-python, texlive
 Standards-Version: 3.8.0
 X-Python3-Version: >= 3.6
 

python/setup.py

@@ -6,5 +6,12 @@
       description='Python bindings for libspud',
       ext_modules=[Extension('libspud', sources=['libspud.c'],
                              libraries=["spud"],
+                             # path to libspud (the actual library, not the c-extension python wrapper 
+                             # which will be put in the parent directory by "make libspud.la"
+                             # NOTE: For this to work you have to run "python setup.py build" from the
+                             # original directory of the current file separately before
+                             # running pip install, as pip will build the extension (if it's not built already)
+                             # outside of the current context
                              library_dirs=[abspath("..")],
+                             # path to spud.h
                              include_dirs=[abspath("../include")])])