[med-svn] [Git][med-team/epigrass][master] Start adding py3 and PyQt5 support

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / epigrass


Commits:
bcafc854 by Michael R. Crusoe at 2019-03-01T21:20:51Z
Start adding py3 and PyQt5 support

- - - - -


7 changed files:

- debian/changelog
- + debian/clean
- debian/control
- + debian/patches/py3
- debian/patches/series
- − debian/patches/sqlite3.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,7 @@
 epigrass (2.4.7-3) UNRELEASED; urgency=medium
 
+  * Team upload.
+
   [ Steffen Moeller ]
   * debian/upstream/metadata:
     - yamllint cleanliness
@@ -19,6 +21,9 @@ epigrass (2.4.7-3) UNRELEASED; urgency=medium
   * Trim trailing whitespace.
   * Use secure copyright file specification URI.
 
+  [ Michael R. Crusoe ]
+  * Added py3 compatability and migrated to PyQt5
+
  -- Andreas Tille <tille at debian.org>  Wed, 17 Oct 2018 16:20:32 +0200
 
 epigrass (2.4.7-2) unstable; urgency=medium


=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+epigrass/Epigrass/epimodels.c


=====================================
debian/control
=====================================
@@ -6,12 +6,21 @@ Section: science
 Priority: optional
 Build-Depends: debhelper (>= 11~),
                dh-python,
-               python-dev,
-               python-setuptools,
-               python-virtualenv,
-               python-sqlsoup,
-               python-redis,
-               cython
+               python3-dev,
+               python3-setuptools,
+               python3-virtualenv,
+               python3-sqlsoup,
+               python3-redis,
+               python3-requests,
+               python3-numpy,
+               python3-networkx,
+               python3-dbfread,
+               python3-mysqldb,
+               python3-matplotlib,
+               python3-gdal,
+               python3-pyqt5.qwt,
+               python3-pyqt5.qtopengl,
+               cython3
 Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/med-team/epigrass
 Vcs-Git: https://salsa.debian.org/med-team/epigrass.git
@@ -21,21 +30,21 @@ Package: epigrass
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         ${python:Depends},
-         python-sqlobject,
-         python-qt4-gl,
-         python-qwt5-qt4,
-         python-numpy,
-         python-gdal,
-         python-formencode,
-         python-mysqldb,
-         python-pysqlite2,
-         python-matplotlib,
-         python-networkx,
-         python-pkg-resources,
-         python-sqlalchemy,
-         python-sqlsoup,
-         python-redis,
+         ${python3:Depends},
+         python3-sqlobject,
+         python3-pyqt5.qwt,
+         python3-pyqt5.qtopengl,
+         python3-numpy,
+         python3-gdal,
+         python3-formencode,
+         python3-mysqldb,
+         python3-matplotlib,
+         python3-networkx,
+         python3-pkg-resources,
+         python3-sqlalchemy,
+         python3-sqlsoup,
+         python3-redis,
+         python3-pyglet,
          redis-server
 Suggests: grass,
           epigrass-doc,


=====================================
debian/patches/py3
=====================================
The diff for this file was not included because it is too large.

=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-sqlite3.patch
+py3


=====================================
debian/patches/sqlite3.patch deleted
=====================================
@@ -1,16 +0,0 @@
-Author: V. Hiremath
-Last-Update: Wed, 21 May 2014 11:10:43 +0200
-Forwarded-Upstream: no
-Description: Use Debian packaged SQLite wrapper
-
---- a/Epigrass/manager.py
-+++ b/Epigrass/manager.py
-@@ -11,7 +11,7 @@ from argparse import ArgumentParser
- import ConfigParser
- import string
- import json
--import sqlite3
-+from pysqlite2 import dbapi2 as sqlite3
- import os
- import getpass
- import MySQLdb


=====================================
debian/rules
=====================================
@@ -6,13 +6,22 @@ export PYBUILD_DESTDIR=debian/$(DEB_SOURCE)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with python2 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild
+
+override_dh_clean:
+	dh_clean
+	rm -f Epigrass/epimodels.c
 
 override_dh_auto_install:
 	dh_auto_install -- --after-install='mv {destdir}/{install_dir}/Epigrass/egicon.png {destdir}/usr/share/pixmaps/epigrass.png; \
 					    ln -s /usr/share/pixmaps/epigrass.png {destdir}/{install_dir}/Epigrass/egicon.png'
+	#PYTHONPATH=debian/epigrass/usr/lib/python3.7/dist-packages/ \
+	#	debian/epigrass/usr/bin/epirunner --help
 
 override_dh_installdocs:
 	# no idea why doc is installed in main package as well - just remove this copy
 	dh_installdocs
 	rm debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)/Epigrass.pdf*
+
+#override_dh_auto_test: override_dh_auto_install 
+#	PYTHONPATH=./debian/epigrass/usr/lib/python3.7/dist-packages/ debian/epigrass/usr/bin/epigrass --help



View it on GitLab: https://salsa.debian.org/med-team/epigrass/commit/bcafc8540acf22bf6e1b828b4dcfd967ba2c03af

-- 
View it on GitLab: https://salsa.debian.org/med-team/epigrass/commit/bcafc8540acf22bf6e1b828b4dcfd967ba2c03af
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190301/f7839e9a/attachment-0001.html>