[arch-commits] Commit in python-xlwt/trunk (PKGBUILD python3.6.patch)

[Andrzej Giniewicz]

    Date: Saturday, January 21, 2017 @ 12:33:57
  Author: aginiewicz
Revision: 208260

upgpkg: python-xlwt 1.2.0-1

python-xlwt: new upstream release

Modified:
  python-xlwt/trunk/PKGBUILD
Deleted:
  python-xlwt/trunk/python3.6.patch

-----------------+
 PKGBUILD        |   11 ++++-------
 python3.6.patch |   36 ------------------------------------
 2 files changed, 4 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-21 12:31:14 UTC (rev 208259)
+++ PKGBUILD	2017-01-21 12:33:57 UTC (rev 208260)
@@ -5,21 +5,18 @@
 
 pkgbase=python-xlwt
 pkgname=('python2-xlwt' 'python-xlwt')
-pkgver=1.1.2
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="Library to create spreadsheet files compatible with MS Excel 97/2000/XP/2003 XLS files"
 arch=('any')
 url="http://www.python-excel.org/"
 license=('BSD')
 makedepends=('python2-setuptools' 'python-setuptools')
-source=("https://github.com/python-excel/xlwt/archive/${pkgver}.tar.gz"
-        python3.6.patch)
-md5sums=('7533c37c5908200627b754c135241b75'
-         '0c6581f27989b3c141d78b53b09092a1')
+source=("https://github.com/python-excel/xlwt/archive/${pkgver}.tar.gz")
+md5sums=('9af8df71cbd13911a89250dc374e613c')
 
 build() {
   cd "$srcdir"
-  (cd xlwt-${pkgver}; patch -p1 -i ../python3.6.patch)
   cp -a xlwt-${pkgver} xlwt-py2-${pkgver}
 
   msg "Building Python2"

Deleted: python3.6.patch
===================================================================
--- python3.6.patch	2017-01-21 12:31:14 UTC (rev 208259)
+++ python3.6.patch	2017-01-21 12:33:57 UTC (rev 208260)
@@ -1,36 +0,0 @@
-From 86564ef26341020316cd8a27c704ef1dc5a6129b Mon Sep 17 00:00:00 2001
-From: Jon Dufresne <jon.dufresne at gmail.com>
-Date: Thu, 18 Aug 2016 17:17:24 -0700
-Subject: [PATCH] Remove LOCALE from str regular expression
-
-Fixes warning:
-
-DeprecationWarning: LOCALE flag with a str pattern is deprecated. Will be an error in 3.6
-
-Fixes #90
----
- xlwt/ExcelFormulaLexer.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/xlwt/ExcelFormulaLexer.py b/xlwt/ExcelFormulaLexer.py
-index 46a2bff..8ff7386 100644
---- a/xlwt/ExcelFormulaLexer.py
-+++ b/xlwt/ExcelFormulaLexer.py
-@@ -3,7 +3,7 @@
- 
- from .antlr import EOF, CommonToken as Tok, TokenStream, TokenStreamException
- from . import ExcelFormulaParser
--from re import compile as recompile, LOCALE, IGNORECASE, VERBOSE
-+from re import compile as recompile, IGNORECASE, VERBOSE
- 
- 
- int_const_pattern = r"\d+\b"
-@@ -50,7 +50,7 @@
- 
- _re = recompile(
-     '(' + ')|('.join([i[0] for i in pattern_type_tuples]) + ')',
--    VERBOSE+LOCALE+IGNORECASE)
-+    VERBOSE+IGNORECASE)
- 
- _toktype = [None] + [i[1] for i in pattern_type_tuples]
- # need dummy at start because re.MatchObject.lastindex counts from 1