[arch-commits] Commit in python-colorama/repos/community-any (3 files)

[Felix Yan]

    Date: Tuesday, March 8, 2016 @ 11:53:26
  Author: fyan
Revision: 165592

archrelease: copy trunk to community-any

Added:
  python-colorama/repos/community-any/PKGBUILD
    (from rev 165591, python-colorama/trunk/PKGBUILD)
Deleted:
  python-colorama/repos/community-any/PKGBUILD
  python-colorama/repos/community-any/wrapped.patch

---------------+
 PKGBUILD      |  117 +++++++++++++++++++++++++++-----------------------------
 wrapped.patch |   49 -----------------------
 2 files changed, 57 insertions(+), 109 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-08 10:52:59 UTC (rev 165591)
+++ PKGBUILD	2016-03-08 10:53:26 UTC (rev 165592)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Alexander Duscheleit <jinks at archlinux.us>
-
-pkgbase=python-colorama
-pkgname=('python-colorama' 'python2-colorama')
-pkgver=0.3.6
-pkgrel=1
-pkgdesc="Python API for cross-platform colored terminal text."
-arch=('any')
-url="http://pypi.python.org/pypi/colorama"
-license=('BSD')
-makedepends=('python-setuptools' 'python2-setuptools' 'git')
-checkdepends=('python-mock' 'python2-mock')
-source=("git+https://github.com/tartley/colorama.git#tag=$pkgver"
-        wrapped.patch)
-md5sums=('SKIP'
-         '5845be5ce4ac50b5e74c4ca44424e669')
-
-prepare() {
-  # https://github.com/tartley/colorama/pull/84
-  (cd colorama; patch -p1 -i ../wrapped.patch)
-  cp -a colorama{,-py2}
-}
-
-build() {
-  cd "$srcdir/colorama"
-  python setup.py build
-
-  cd "$srcdir/colorama-py2"
-  python2 setup.py build
-}
-
-check() {
-  cd "$srcdir/colorama"
-  python -m unittest discover -p *_test.py || warning "Tests failed"
-
-  cd "$srcdir/colorama-py2"
-  python2 -m unittest discover -p *_test.py || warning "Tests failed"
-}
-
-package_python-colorama() {
-  depends=('python')
-
-  cd "$srcdir/colorama"
-  python setup.py install --root="$pkgdir" --optimize=1
-
-  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
-}
-
-package_python2-colorama() {
-  depends=('python2')
-
-  cd "$srcdir/colorama-py2"
-  python2 setup.py install --root="$pkgdir" --optimize=1
-
-  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: python-colorama/repos/community-any/PKGBUILD (from rev 165591, python-colorama/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2016-03-08 10:53:26 UTC (rev 165592)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Alexander Duscheleit <jinks at archlinux.us>
+
+pkgbase=python-colorama
+pkgname=('python-colorama' 'python2-colorama')
+pkgver=0.3.7
+_commit=9f5a28369c4528502b9faa76088df965f6ac103d
+pkgrel=1
+pkgdesc="Python API for cross-platform colored terminal text."
+arch=('any')
+url="http://pypi.python.org/pypi/colorama"
+license=('BSD')
+makedepends=('python-setuptools' 'python2-setuptools' 'git')
+checkdepends=('python-mock' 'python2-mock')
+source=("git+https://github.com/tartley/colorama.git#commit=$_commit")
+md5sums=('SKIP')
+
+prepare() {
+  cp -a colorama{,-py2}
+}
+
+build() {
+  cd "$srcdir/colorama"
+  python setup.py build
+
+  cd "$srcdir/colorama-py2"
+  python2 setup.py build
+}
+
+check() {
+  cd "$srcdir/colorama"
+  python -m unittest discover -p *_test.py || warning "Tests failed"
+
+  cd "$srcdir/colorama-py2"
+  python2 -m unittest discover -p *_test.py || warning "Tests failed"
+}
+
+package_python-colorama() {
+  depends=('python')
+
+  cd "$srcdir/colorama"
+  python setup.py install --root="$pkgdir" --optimize=1
+
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
+}
+
+package_python2-colorama() {
+  depends=('python2')
+
+  cd "$srcdir/colorama-py2"
+  python2 setup.py install --root="$pkgdir" --optimize=1
+
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: wrapped.patch
===================================================================
--- wrapped.patch	2016-03-08 10:52:59 UTC (rev 165591)
+++ wrapped.patch	2016-03-08 10:53:26 UTC (rev 165592)
@@ -1,49 +0,0 @@
-From b29cb9231bacd87a16f947b945708bfac99b33a0 Mon Sep 17 00:00:00 2001
-From: Daniel Hahler <git at thequod.de>
-Date: Fri, 22 Jan 2016 22:54:52 +0100
-Subject: [PATCH] Check for 'closed' attribute on 'wrapped' in AnsiToWin32
-
----
- colorama/ansitowin32.py            | 8 ++++++--
- colorama/tests/ansitowin32_test.py | 5 ++++-
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/colorama/ansitowin32.py b/colorama/ansitowin32.py
-index a750d2a..0698eba 100644
---- a/colorama/ansitowin32.py
-+++ b/colorama/ansitowin32.py
-@@ -64,12 +64,16 @@ def __init__(self, wrapped, convert=None, strip=None, autoreset=False):
- 
-         # should we strip ANSI sequences from our output?
-         if strip is None:
--            strip = conversion_supported or (not wrapped.closed and not is_a_tty(wrapped))
-+            strip = conversion_supported or (
-+                hasattr(wrapped, 'closed') and not wrapped.closed and not
-+                is_a_tty(wrapped))
-         self.strip = strip
- 
-         # should we should convert ANSI sequences into win32 calls?
-         if convert is None:
--            convert = conversion_supported and not wrapped.closed and is_a_tty(wrapped)
-+            convert = (conversion_supported and
-+                       hasattr(wrapped, 'closed') and not
-+                       wrapped.closed and is_a_tty(wrapped))
-         self.convert = convert
- 
-         # dict of ansi codes to win32 functions and parameters
-diff --git a/colorama/tests/ansitowin32_test.py b/colorama/tests/ansitowin32_test.py
-index f351763..5ba96d0 100644
---- a/colorama/tests/ansitowin32_test.py
-+++ b/colorama/tests/ansitowin32_test.py
-@@ -166,7 +166,10 @@ def test_reset_all_shouldnt_raise_on_closed_orig_stdout(self):
-     def test_wrap_shouldnt_raise_on_closed_orig_stdout(self):
-         stream = StringIO()
-         stream.close()
--        converter = AnsiToWin32(stream)
-+        AnsiToWin32(stream)
-+
-+    def test_wrap_shouldnt_raise_on_missing_closed_attrib(self):
-+        AnsiToWin32(object())
- 
-     def testExtractParams(self):
-         stream = AnsiToWin32(Mock())