Skip to content

Commit e7008e8

Browse files
committed
chore: updated packaging for python3
1 parent 2fc30bc commit e7008e8

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

packaging/debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ Source: mamonsu
22
Section: admin
33
Priority: optional
44
Maintainer: Dmitry Vasilyev <dba@postgrespro.ru>
5-
Build-Depends: debhelper, python-dev, python-setuptools
5+
Build-Depends: debhelper, python3-dev, python3-setuptools
66
XS-Python-Version: all
77
Standards-Version: 3.7.3
88

99
Package: mamonsu
1010
Architecture: all
11-
Depends: ${python:Depends}, python-pkg-resources
11+
Depends: ${python:Depends}, python3-pkg-resources
1212
XB-Python-Version: ${python:Versions}
1313
Provides: ${python:Provides}
1414
Description: Monitoring agent for PostgreSQL

packaging/debian/pycompat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2
1+
3

packaging/debian/pyversions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6
1+
3.6

packaging/debian/rules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ configure-stamp:
88
build: configure-stamp build-stamp
99
build-stamp:
1010
dh_testdir
11-
python setup.py build build_ext
11+
python3 setup.py build build_ext
1212
touch build-stamp
1313

1414
clean:
1515
rm -f build-stamp configure-stamp
1616
[ ! -f Makefile ] || $(MAKE) clean
17-
python setup.py clean
17+
python3 setup.py clean
1818
find mamonsu -name "*.pyc" -exec rm {} \;
1919

2020
install: build
2121
dh_testdir
2222
dh_testroot
2323
dh_clean -k
2424
dh_installdirs
25-
python setup.py install --install-layout=deb --root=debian/mamonsu
25+
python3 setup.py install --install-layout=deb --root=debian/mamonsu
2626

2727
binary-indep: build install
2828
dh_testdir -i

packaging/rpm/SPECS/mamonsu.spec

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ License: BSD
77
Source0: http://pypi.python.org/packages/source/m/mamonsu/mamonsu-%{version}.tar.gz
88
Source1: mamonsu.init
99
Source2: mamonsu-logrotate.in
10-
BuildRequires: python2-devel
11-
BuildRequires: python-setuptools
10+
BuildRequires: python3-devel
11+
BuildRequires: python3-setuptools
1212
BuildArch: noarch
13-
Requires: python-setuptools
13+
Requires: python3-setuptools
1414

1515
%description
1616
Monitoring agent for PostgreSQL.
@@ -19,11 +19,11 @@ Monitoring agent for PostgreSQL.
1919
%setup -q
2020

2121
%build
22-
%{__python} setup.py build
22+
%{__python3} setup.py build
2323

2424
%install
25-
%{__python} setup.py install --skip-build --root %{buildroot}
26-
export PYTHONPATH=%{buildroot}%{python_sitelib}
25+
%{__python3} setup.py install --skip-build --root %{buildroot}
26+
export PYTHONPATH=%{buildroot}%{python3_sitelib}
2727

2828
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
2929
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/init.d
@@ -39,8 +39,8 @@ export PYTHONPATH=%{buildroot}%{python_sitelib}
3939
%files
4040
%doc README.rst
4141
%config(noreplace) %{_sysconfdir}/%{name}/agent.conf
42-
%{python_sitelib}/%{name}/
43-
%{python_sitelib}/%{name}-%{version}*
42+
%{python3_sitelib}/%{name}/
43+
%{python3_sitelib}/%{name}-%{version}*
4444
%{_sysconfdir}/%{name}
4545
%{_datarootdir}/%{name}
4646
%{_sysconfdir}/init.d/%{name}

packaging/scripts/rpm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -o pipefail
77

88
ulimit -n 1024
99

10-
yum install -y -q tar make rpm-build python2-devel python-setuptools
10+
yum install -y -q tar make rpm-build python3-devel python3-setuptools
1111

1212
cp -a /app/in /var/build
1313
find /var/build -type d -exec chmod 0755 {} \;

0 commit comments

Comments
 (0)