[Python-modules-commits] [python-twitter] 04/04: Update changelog and dependency for v3.3

Koichi Akabe vbkaisetsu-guest at moszumanska.debian.org
Sat Oct 21 02:13:45 UTC 2017


This is an automated email from the git hooks/post-receive script.

vbkaisetsu-guest pushed a commit to branch master
in repository python-twitter.

commit ffafeaee9d6e4a1b50724941023dd1fcaafb43b3
Author: Koichi Akabe <vbkaisetsu at gmail.com>
Date:   Mon Oct 16 00:36:46 2017 +0900

    Update changelog and dependency for v3.3
---
 debian/changelog              | 19 ++++++++++++
 debian/control                | 20 ++++++++++--
 debian/copyright              |  6 ++--
 debian/python-twitter.install |  2 +-
 debian/rules                  | 72 +++++++++++++++++++++----------------------
 debian/watch                  |  4 +--
 6 files changed, 79 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9557903..4625ed4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+python-twitter (3.3-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * debian/patches/*
+   - remove because these patches are not needed for the latest package.
+  * debian/control
+   - support Python 3 (add python3-twitter package)
+   - bump standard version to 4.1.1
+   - update build depends for Python 3
+  * debian/copyright
+   - change the upstream website
+  * debian/watch
+   - change the upstream website
+  * debian/rules, debian/python-twitter.install
+   - remove example applications
+   - run tests
+
+ -- Koichi Akabe <vbkaisetsu at gmail.com>  Sun, 15 Oct 2017 13:55:38 +0900
+
 python-twitter (1.1+git20131227-3) UNRELEASED; urgency=medium
 
   * Fixed VCS URL (https)
diff --git a/debian/control b/debian/control
index 0bd9265..9867b92 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,17 @@ Section: python
 Priority: extra
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Koichi Akabe <vbkaisetsu at gmail.com>
-Build-Depends: debhelper (>= 9.0.0), python (>= 2.7), python-setuptools, python-requests-oauthlib, python-sphinx
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9.0.0), dh-python, python (>= 2.7), python3 (>= 3.5),
+               python-pytest-runner, python3-pytest-runner, python-pytest, python3-pytest,
+               python-responses, python3-responses, python-setuptools, python3-setuptools,
+               python-requests-oauthlib, python3-requests-oauthlib, python3-sphinx,
+               python3-sphinx-rtd-theme
+Standards-Version: 4.1.1
 Homepage: https://github.com/bear/python-twitter
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-twitter.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-twitter.git
 X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.5
 
 Package: python-twitter
 Architecture: all
@@ -21,6 +26,17 @@ Description: Twitter API wrapper for Python
  SMS. Twitter exposes a web services API (http://twitter.com/help/api) and this
  library is intended to make it even easier for Python programmers to use.
 
+Package: python3-twitter
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Suggests: www-browser, python-twitter-doc
+Description: Twitter API wrapper for Python 3
+ This library provides a pure Python 3 interface for the Twitter API.
+ .
+ Twitter provides a service that allows people to connect via the web, IM, and
+ SMS. Twitter exposes a web services API (http://twitter.com/help/api) and this
+ library is intended to make it even easier for Python programmers to use.
+
 Package: python-twitter-doc
 Section: doc
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 5369bb8..7a420ef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: python-twitter
-Source: http://code.google.com/p/python-twitter/
+Source: https://github.com/bear/python-twitter
 
 Files: *
-Copyright: 2007 The Python-Twitter Developers <python-twitter at googlegroups.com>
+Copyright: 2007-2016 The Python-Twitter Developers <python-twitter at googlegroups.com>
 License: Apache
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ License: Apache
 
 Files: debian/*
 Copyright: 2008 Mauro Lizaur <lavaramano at gmail.com>
-           2012 Koichi Akabe <vbkaisetsu at gmail.com>
+           2012-2017 Koichi Akabe <vbkaisetsu at gmail.com>
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/python-twitter.install b/debian/python-twitter.install
index 6845771..96a2dca 100644
--- a/debian/python-twitter.install
+++ b/debian/python-twitter.install
@@ -1 +1 @@
-usr/lib
+usr/lib/python2.7
diff --git a/debian/rules b/debian/rules
index 519bfa7..317e677 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,21 @@
 #!/usr/bin/make -f
 
+export PYBUILD_BEFORE_TEST=cp -r {dir}/tests {build_dir}/; cp -r {dir}/testdata {build_dir}/
+export PYBUILD_TEST_ARGS=-k-test_parse_media_file_http
+export PYBUILD_TEST_PYTEST=1
+
 %:
-	dh "$@" --with python2,sphinxdoc --buildsystem=python_distutils
+	dh "$@" --with python3,python2,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
 	dh_auto_build
 	cd $(CURDIR)/doc && $(MAKE) html
 
-override_dh_auto_install:
-	dh_auto_install
-	install -m 755 $(CURDIR)/examples/tweet.py $(CURDIR)/debian/python-twitter/usr/bin/tweet
-	install -m 755 $(CURDIR)/examples/twitter-to-xhtml.py $(CURDIR)/debian/python-twitter/usr/bin/twitter-to-xhtml
-
 override_dh_auto_clean:
 	dh_auto_clean
 	cd $(CURDIR)/doc && $(MAKE) clean
 	rm -rf $(CURDIR)/python_twitter.egg-info
+	rm -rf $(CURDIR)/.eggs
 
 override_dh_compress:
 	dh_compress -X.js -X.inv
@@ -23,33 +23,33 @@ override_dh_compress:
 override_dh_sphinxdoc:
 	(! test -d $(CURDIR)/debian/python-twitter-doc || dh_sphinxdoc)
 
-PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
-PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
-VER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
-
-## http://wiki.debian.org/onlyjob/get-orig-source
-.PHONY: get-orig-source
-get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE))
-	@
-
-UURL = git://github.com/bear/python-twitter.git
-UDATE = $(shell date --rfc-3339=seconds --date='TZ="UTC" $(shell echo $(VER) | perl -ne 'print "$$1-$$2-$$3" if m/\+(?:git|svn|hg)(\d{4})(\d{2})(\d{2})/')')
-$(PKG)_$(VER)$(DTYPE).orig.tar.xz: $(info I: UDATE=$(UDATE))
-	$(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..))
-	@echo "# Downloading..."
-	git clone $(UURL) $(PKG)-$(VER) \
-	|| $(RM) -r $(PKG)-$(VER)
-	cd $(PKG)-$(VER) \
-	&& git checkout v$(VER) || git checkout $$(git log -n1 --format=%h --before="$(UDATE)") \
-	&& [ -s ChangeLog ] || ( echo "# Generating ChangeLog..." \
-	   ; git log --pretty="format:%ad  %aN  <%aE>%n%n%x09* %s%n" --date=short > ChangeLog \
-	   ; touch -d "$$(git log -1 --format='%ci')" ChangeLog) \
-	&& echo "# Setting times..." \
-	&& for F in $$(git ls-tree -r --name-only HEAD); do touch --no-dereference -d "$$(git log -1 --format="%ai" -- $$F)" "$$F"; done \
-	&& echo "# Cleaning-up..." \
-	&& $(RM) -r simplejson doc/_build \
-	&& $(RM) -r .git .git*
-	@echo "# Packing..."
-	find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
-	| XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
-	&& $(RM) -r "$(PKG)-$(VER)"
+# PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
+# PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
+# VER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
+#
+# ## http://wiki.debian.org/onlyjob/get-orig-source
+# .PHONY: get-orig-source
+# get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE))
+# 	@
+#
+# UURL = git://github.com/bear/python-twitter.git
+# UDATE = $(shell date --rfc-3339=seconds --date='TZ="UTC" $(shell echo $(VER) | perl -ne 'print "$$1-$$2-$$3" if m/\+(?:git|svn|hg)(\d{4})(\d{2})(\d{2})/')')
+# $(PKG)_$(VER)$(DTYPE).orig.tar.xz: $(info I: UDATE=$(UDATE))
+# 	$(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..))
+# 	@echo "# Downloading..."
+# 	git clone $(UURL) $(PKG)-$(VER) \
+# 	|| $(RM) -r $(PKG)-$(VER)
+# 	cd $(PKG)-$(VER) \
+# 	&& git checkout v$(VER) || git checkout $$(git log -n1 --format=%h --before="$(UDATE)") \
+# 	&& [ -s ChangeLog ] || ( echo "# Generating ChangeLog..." \
+# 	   ; git log --pretty="format:%ad  %aN  <%aE>%n%n%x09* %s%n" --date=short > ChangeLog \
+# 	   ; touch -d "$$(git log -1 --format='%ci')" ChangeLog) \
+# 	&& echo "# Setting times..." \
+# 	&& for F in $$(git ls-tree -r --name-only HEAD); do touch --no-dereference -d "$$(git log -1 --format="%ai" -- $$F)" "$$F"; done \
+# 	&& echo "# Cleaning-up..." \
+# 	&& $(RM) -r simplejson doc/_build \
+# 	&& $(RM) -r .git .git*
+# 	@echo "# Packing..."
+# 	find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
+# 	| XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
+# 	&& $(RM) -r "$(PKG)-$(VER)"
diff --git a/debian/watch b/debian/watch
index 4e831dd..15c57fb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
+version=4
 
-http://code.google.com/p/python-twitter/downloads/list?can=1 .*/python-twitter-(\d[\d.]*)\.tar\.gz
+https://github.com/bear/python-twitter/releases /bear/python-twitter/archive/v(\d[\d.]*)\.tar\.gz  debian uupdate

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-twitter.git



More information about the Python-modules-commits mailing list