diff -Nru logilab-common-1.4.3/debian/changelog logilab-common-1.4.3/debian/changelog --- logilab-common-1.4.3/debian/changelog 2019-08-10 23:20:32.000000000 +0000 +++ logilab-common-1.4.3/debian/changelog 2019-08-30 01:25:07.000000000 +0000 @@ -1,3 +1,9 @@ +logilab-common (1.4.3-2) unstable; urgency=medium + + * Drop python 2 support + + -- Sandro Tosi Thu, 29 Aug 2019 21:25:07 -0400 + logilab-common (1.4.3-1) unstable; urgency=medium * New upstream release diff -Nru logilab-common-1.4.3/debian/control logilab-common-1.4.3/debian/control --- logilab-common-1.4.3/debian/control 2019-08-10 23:20:32.000000000 +0000 +++ logilab-common-1.4.3/debian/control 2019-08-30 01:25:07.000000000 +0000 @@ -3,42 +3,18 @@ Priority: optional Maintainer: Sandro Tosi Uploaders: Debian Python Modules Team -Build-Depends: debhelper (>= 7.0.50~), python (>= 2.5.3-1~), python3-all, python-setuptools, python3-setuptools -Build-Depends-Indep: dh-python, python3-sphinx, graphviz, python-egenix-mxdatetime, python-unittest2, python-six, python3-six, python-tz, python3-tz +Build-Depends: debhelper (>= 7.0.50~), python3, python3-setuptools +Build-Depends-Indep: dh-python, python3-sphinx, graphviz, python3-six, python3-tz XS-Python-Version: all Standards-Version: 4.4.0 Homepage: https://www.logilab.org/project/logilab-common Vcs-Git: https://salsa.debian.org/python-team/modules/logilab-common.git Vcs-Browser: https://salsa.debian.org/python-team/modules/logilab-common -Package: python-logilab-common -Architecture: all -Provides: ${python:Provides} -Depends: ${python:Depends}, ${misc:Depends}, python-six -Recommends: python-egenix-mxdatetime -Suggests: pyro, python-unittest2 -Description: useful miscellaneous modules used by Logilab projects - logilab-common is a collection of low-level Python packages and modules, - A - designed to ease: - . - * handling command line options and configuration files - * writing interactive command line tools - * manipulation files and character strings - * interfacing to OmniORB - * generating SQL queries - * running unit tests - * manipulating tree structures - * accessing RDBMS (currently postgreSQL, MySQL and sqlite) - * generating text and HTML reports - * logging - * parsing XML processing instructions - Package: python3-logilab-common Architecture: all Depends: ${python3:Depends}, ${misc:Depends}, python3-six -#Recommends: python-egenix-mxdatetime -#Suggests: pyro, python-unittest2 +Conflicts: python-logilab-common Description: useful miscellaneous modules used by Logilab projects (Python3) logilab-common is a collection of low-level Python packages and modules, designed to ease: diff -Nru logilab-common-1.4.3/debian/python3-logilab-common.doc-base logilab-common-1.4.3/debian/python3-logilab-common.doc-base --- logilab-common-1.4.3/debian/python3-logilab-common.doc-base 1970-01-01 00:00:00.000000000 +0000 +++ logilab-common-1.4.3/debian/python3-logilab-common.doc-base 2019-08-30 01:25:07.000000000 +0000 @@ -0,0 +1,9 @@ +Document: python-logilab-common +Title: Logilab common library API +Author: LOGILAB S.A. +Abstract: Logilab common library (aka Logilab's extension to the standard library). +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/python3-logilab-common/html/index.html +Files: /usr/share/doc/python3-logilab-common/html/* diff -Nru logilab-common-1.4.3/debian/python3-logilab-common.manpages logilab-common-1.4.3/debian/python3-logilab-common.manpages --- logilab-common-1.4.3/debian/python3-logilab-common.manpages 1970-01-01 00:00:00.000000000 +0000 +++ logilab-common-1.4.3/debian/python3-logilab-common.manpages 2019-08-30 01:25:07.000000000 +0000 @@ -0,0 +1 @@ +docs/logilab-pytest.1 diff -Nru logilab-common-1.4.3/debian/python-logilab-common.doc-base logilab-common-1.4.3/debian/python-logilab-common.doc-base --- logilab-common-1.4.3/debian/python-logilab-common.doc-base 2019-08-10 23:20:32.000000000 +0000 +++ logilab-common-1.4.3/debian/python-logilab-common.doc-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -Document: python-logilab-common -Title: Logilab common library API -Author: LOGILAB S.A. -Abstract: Logilab common library (aka Logilab's extension to the standard library). -Section: Programming/Python - -Format: HTML -Index: /usr/share/doc/python-logilab-common/html/index.html -Files: /usr/share/doc/python-logilab-common/html/* diff -Nru logilab-common-1.4.3/debian/python-logilab-common.manpages logilab-common-1.4.3/debian/python-logilab-common.manpages --- logilab-common-1.4.3/debian/python-logilab-common.manpages 2019-08-10 23:20:32.000000000 +0000 +++ logilab-common-1.4.3/debian/python-logilab-common.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -docs/logilab-pytest.1 diff -Nru logilab-common-1.4.3/debian/rules logilab-common-1.4.3/debian/rules --- logilab-common-1.4.3/debian/rules 2019-08-10 23:20:32.000000000 +0000 +++ logilab-common-1.4.3/debian/rules 2019-08-30 01:25:07.000000000 +0000 @@ -3,53 +3,46 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/python/python.mk +include /usr/share/python3/python.mk # Python default library and script directories -LIB := $(shell python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_purelib") -SCRIPT := $(shell python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_scripts") LIB3 := $(shell python3 -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print (b.build_purelib)") SCRIPT3 := $(shell python3 -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print (b.build_scripts)") %: - dh $@ --with python2,python3,sphinxdoc + dh $@ --with python3,sphinxdoc --buildsystem=pybuild override_dh_auto_build: # python module build - NO_SETUPTOOLS=1 python setup.py build NO_SETUPTOOLS=1 python3 setup.py build # we need this hack because we have to import "logilab.common.pytest" # and for doc generation, but since it's a namespace package, # we need to "simulate" it - touch $(CURDIR)/$(LIB)/logilab/__init__.py + touch $(CURDIR)/$(LIB3)/logilab/__init__.py # build doc $(MAKE) -C docs html # remove dummy file - rm -f $(CURDIR)/$(LIB)/logilab/__init__.py + rm -f $(CURDIR)/$(LIB3)/logilab/__init__.py override_dh_auto_test: ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),) # we need this hack because we have to import "logilab.common.pytest" # and for doc generation, but since it's a namespace package, # we need to "simulate" it - touch $(CURDIR)/$(LIB)/logilab/__init__.py touch $(CURDIR)/$(LIB3)/logilab/__init__.py # run tests # use the default python version to select the script dir to run the tests - -PYTHONPATH=$(CURDIR)/$(LIB)/ $(CURDIR)/$(SCRIPT)/logilab-pytest -t $(CURDIR)/test -PYTHONPATH=$(CURDIR)/$(LIB3)/ $(CURDIR)/$(SCRIPT3)/logilab-pytest -t $(CURDIR)/test # remove dummy file - rm -f $(CURDIR)/$(LIB)/logilab/__init__.py rm -f $(CURDIR)/$(LIB3)/logilab/__init__.py endif override_dh_auto_clean: - NO_SETUPTOOLS=1 python setup.py clean NO_SETUPTOOLS=1 python3 setup.py clean find . -name "*.pyc" -delete @@ -57,18 +50,12 @@ dh_clean override_dh_auto_install: build - NO_SETUPTOOLS=1 python setup.py install --no-compile \ - --root=$(CURDIR)/debian/python-logilab-common/ \ - ${py_setup_install_args} NO_SETUPTOOLS=1 python3 setup.py install --no-compile \ --root=$(CURDIR)/debian/python3-logilab-common/ \ ${py_setup_install_args} - # move logilab-pytest to logilab-pytest3 for py3k package - mv debian/python3-logilab-common/usr/bin/logilab-pytest debian/python3-logilab-common/usr/bin/logilab-pytest3 # remove __pycache__ dirs find $(CURDIR)/debian/python3-logilab-common -type d -name "__pycache__" | xargs rm -rf # remove test directory - rm -rf debian/python-logilab-common/usr/lib/python*/*-packages/logilab/common/test rm -rf debian/python3-logilab-common/usr/lib/python*/*-packages/logilab/common/test override_dh_installchangelogs: @@ -77,12 +64,5 @@ override_dh_installdocs: dh_installdocs README docs/_build/html/ -override_dh_installman: - dh_installman - # install the manpage for the py3k package - cp docs/logilab-pytest.1 docs/logilab-pytest3.1 - dh_installman -p python3-logilab-common docs/logilab-pytest3.1 - rm docs/logilab-pytest3.1 - override_dh_compress: dh_compress -X.py -X.ini -X.xml -Xtest/ -Xapidoc/