[med-svn] [Git][med-team/emperor][master] Drop python2 related stuff

[Liubov Chuprikova]

Liubov Chuprikova pushed to branch master at Debian Med / emperor


Commits:
1c61a802 by Liubov Chuprikova at 2019-09-12T14:44:09Z
Drop python2 related stuff

- - - - -


7 changed files:

- debian/control
- − debian/python-emperor-doc.doc-base
- − debian/python-emperor.links
- + debian/python3-emperor-doc.doc-base
- debian/python-emperor-doc.docs → debian/python3-emperor-doc.docs
- debian/python-emperor-doc.links → debian/python3-emperor-doc.links
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -7,8 +7,6 @@ Section: science
 Priority: optional
 Build-Depends: debhelper (>= 12~),
                dh-python,
-               python-all,
-               python-setuptools,
                python3-all,
                python3-setuptools,
                python3-sphinx,
@@ -26,31 +24,6 @@ Homepage: https://biocore.github.io/emperor/
 Vcs-Browser: https://salsa.debian.org/med-team/emperor
 Vcs-Git: https://salsa.debian.org/med-team/emperor.git
 
-Package: python-emperor
-Architecture: all
-Depends: ${python:Depends},
-         ${misc:Depends},
-         python-numpy,
-         python-scipy,
-         python-click,
-         python-pandas,
-         python-jinja2,
-         python-future,
-         libjs-jquery-ui
-Suggests: python-emperor-doc
-Description: visualizing high-throughput microbial community data
- Emperor is an interactive next generation tool for the analysis,
- visualization and understanding of high throughput microbial
- ecology datasets.
- .
- Due to its tailor-made graphical user interface, delving into a new
- dataset to elucidate the patterns hidden in the data, has never been
- easier. Emperor brings a rich set of customizations and modifications
- that can be integrated into any QIIME or scikit-bio compliant dataset;
- with lightweight data files and hardware accelerated graphics,
- constitutes itself as the state of the art for analyzing N-dimensional
- data using principal coordinates analysis.
-
 Package: python3-emperor
 Architecture: all
 Depends: ${python3:Depends},
@@ -62,7 +35,7 @@ Depends: ${python3:Depends},
          python3-jinja2,
          python3-future,
          libjs-jquery-ui
-Suggests: python-emperor-doc
+Suggests: python3-emperor-doc
 Description: visualizing high-throughput microbial community data
  Emperor is an interactive next generation tool for the analysis,
  visualization and understanding of high throughput microbial
@@ -76,7 +49,7 @@ Description: visualizing high-throughput microbial community data
  constitutes itself as the state of the art for analyzing N-dimensional
  data using principal coordinates analysis.
 
-Package: python-emperor-doc
+Package: python3-emperor-doc
 Architecture: all
 Section: doc
 Depends: ${sphinxdoc:Depends},


=====================================
debian/python-emperor-doc.doc-base deleted
=====================================
@@ -1,9 +0,0 @@
-Document: python-emperor-doc
-Title: emperor: Python 2 and 3 Compatibility Library
-Author: Liubov Chuprikova
-Abstract:
-Section: Science/Biology
-
-Format: html
-Index: /usr/share/doc/python-emperor/html/index.html
-Files: /usr/share/doc/python-emperor/html/*


=====================================
debian/python-emperor.links deleted
=====================================
@@ -1 +0,0 @@
-usr/share/javascript/jquery-ui/themes/base/jquery-ui.min.css	usr/lib/python2.7/dist-packages/emperor/support_files/vendor/css/jquery-ui.min.css


=====================================
debian/python3-emperor-doc.doc-base
=====================================
@@ -0,0 +1,9 @@
+Document: python3-emperor-doc
+Title: emperor:
+Author: Liubov Chuprikova
+Abstract:
+Section: Science/Biology
+
+Format: html
+Index: /usr/share/doc/python3-emperor/html/index.html
+Files: /usr/share/doc/python3-emperor/html/*


=====================================
debian/python-emperor-doc.docs → debian/python3-emperor-doc.docs
=====================================


=====================================
debian/python-emperor-doc.links → debian/python3-emperor-doc.links
=====================================
@@ -1,3 +1,3 @@
-usr/share/twitter-bootstrap/files/js/bootstrap.js	usr/share/doc/python-emperor/html/_static/bootstrap-2.3.2/js/bootstrap.js
-usr/share/twitter-bootstrap/files/js/bootstrap.js	usr/share/doc/python-emperor/html/_static/bootstrap-3.3.7/js/bootstrap.js
-usr/share/javascript/jquery/jquery.min.js	usr/share/doc/python-emperor/html/_static//js/jquery-1.11.0.min.js
+usr/share/twitter-bootstrap/files/js/bootstrap.js	usr/share/doc/python3-emperor/html/_static/bootstrap-2.3.2/js/bootstrap.js
+usr/share/twitter-bootstrap/files/js/bootstrap.js	usr/share/doc/python3-emperor/html/_static/bootstrap-3.3.7/js/bootstrap.js
+usr/share/javascript/jquery/jquery.min.js	usr/share/doc/python3-emperor/html/_static//js/jquery-1.11.0.min.js


=====================================
debian/rules
=====================================
@@ -3,21 +3,17 @@
 # output every command that modifies files on the build system.
 #export DH_VERBOSE = 1
 
-export PYBUILD_NAME=emperor
-
-export PYBUILD_AFTER_BUILD_python3=python{version} setup.py develop --install-dir {build_dir}; \
+export PYBUILD_AFTER_BUILD=python{version} setup.py develop --install-dir {build_dir}; \
 	export PYTHONPATH={build_dir}:$(PYTHONPATH); \
 	$(MAKE) -C doc html; \
 	cp -rv {dir}/tests/test_data {build_dir}/tests
 
-export PYBUILD_DISABLE_python2=test
-
-export PYBUILD_BEFORE_INSTALL_python3=rm -rvf {build_dir}/emperor.egg* \
+export PYBUILD_BEFORE_INSTALL=rm -rvf {build_dir}/emperor.egg* \
 	{build_dir}/site.py {build_dir}/easy-install.pth \
 	{build_dir}/f* {build_dir}/pasteurize {build_dir}/*.py
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_clean:
 	dh_auto_clean



View it on GitLab: https://salsa.debian.org/med-team/emperor/commit/1c61a802d79e4d115f10f3d38539bf3fc8682032

-- 
View it on GitLab: https://salsa.debian.org/med-team/emperor/commit/1c61a802d79e4d115f10f3d38539bf3fc8682032
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/20190912/5546e3a1/attachment-0001.html>