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

Add python3-pip as build dependency
FluidityProject · Oct 31, 2022 · 5df64df · 5df64df
1 parent 81c34df
commit 5df64df
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.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

diff --git a/Makefile.in b/Makefile.in
@@ -95,13 +95,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

diff --git a/debian/control b/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
 

diff --git a/python/setup.py b/python/setup.py
@@ -5,6 +5,4 @@
       version='1.1.3',
       description='Python bindings for libspud',
       ext_modules=[Extension('libspud', sources=['libspud.c'],
-                             libraries=["spud"],
-                             library_dirs=[abspath("..")],
-                             include_dirs=[abspath("../include")])])
+                             libraries=["spud"])])