Skip to content

Commit 50b759a

Browse files
committed
Use "pip install" instead of "python setup.py install"
Add python3-pip as build dependency
1 parent 81c34df commit 50b759a

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
run: |
2323
echo "Europe/London" > /etc/timezone
2424
apt-get -y update
25-
DEBIAN_FRONTEND=noninteractive apt-get -y install gfortran g++ python3-setuptools python3-all-dev debhelper dh-python texlive python3-junit.xml
25+
DEBIAN_FRONTEND=noninteractive apt-get -y install gfortran g++ python3-setuptools python3-pip python3-all-dev debhelper dh-python texlive python3-junit.xml
2626
2727
- name: Configuring
2828
run: ./configure --prefix=/tmp

Makefile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ install-spudtools:
9595
@INSTALL@ -m644 schema/spud_base.rng $(DESTDIR)@prefix@/share/spud
9696

9797
install-diamond:
98-
cd diamond; python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
98+
python3 -mpip install --prefix=$(DESTDIR)@prefix@ diamond/
9999

100100
install-pyspud:
101-
cd python; python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
101+
python3 -mpip install --prefix=$(DESTDIR)@prefix@ python/
102102

103103
install-dxdiff:
104-
cd dxdiff; python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
104+
python3 -mpip install --prefix=$(DESTDIR)@prefix@ dxdiff/
105105

106106
clean:
107107
@cd doc; $(MAKE) clean

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Maintainer: The ICOM team <patrick.farrell@imperial.ac.uk>
33
Uploaders: David Ham <david.ham@imperial.ac.uk>
44
Section: science
55
Priority: optional
6-
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
6+
Build-Depends: gfortran (>=4.2), g++ (>=4.2), python3-setuptools (>= 39), python3-pip, python3-all-dev , debhelper (>= 5.0.38), dh-python, texlive
77
Standards-Version: 3.8.0
88
X-Python3-Version: >= 3.6
99

0 commit comments

Comments
 (0)