Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 104C31A923B for ; Sat, 30 Jan 2021 07:23:32 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 27B1484DA7; Sat, 30 Jan 2021 07:23:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 608D584D53 for ; Sat, 30 Jan 2021 07:23:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 5o-5eGtcrnMl for ; Sat, 30 Jan 2021 07:23:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id BE40F84CBC for ; Sat, 30 Jan 2021 07:23:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B2551FA91; Sat, 30 Jan 2021 07:23:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1611991409143700" MIME-Version: 1.0 Date: Sat, 30 Jan 2021 07:23:29 +0000 From: "Makoto Fujiwara" Subject: CVS commit: pkgsrc/www/py-django-treebeard To: pkgsrc-changes@NetBSD.org Reply-To: mef@netbsd.org X-Mailer: log_accum Message-Id: <20210130072329.B2551FA91@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1611991409143700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mef Date: Sat Jan 30 07:23:29 UTC 2021 Modified Files: pkgsrc/www/py-django-treebeard: Makefile distinfo Added Files: pkgsrc/www/py-django-treebeard/patches: patch-setup.py Log Message: (www/py-django-treebeard) Add patch for build fix, only for py36 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/py-django-treebeard/Makefile \ pkgsrc/www/py-django-treebeard/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/www/py-django-treebeard/patches/patch-setup.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1611991409143700 Content-Disposition: inline Content-Length: 2878 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/py-django-treebeard/Makefile diff -u pkgsrc/www/py-django-treebeard/Makefile:1.12 pkgsrc/www/py-django-treebeard/Makefile:1.13 --- pkgsrc/www/py-django-treebeard/Makefile:1.12 Sat Jan 16 09:01:04 2021 +++ pkgsrc/www/py-django-treebeard/Makefile Sat Jan 30 07:23:29 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2021/01/16 09:01:04 adam Exp $ +# $NetBSD: Makefile,v 1.13 2021/01/30 07:23:29 mef Exp $ DISTNAME= django-treebeard-4.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/django-tree COMMENT= Efficient tree implementations for the Django Web Framework LICENSE= apache-2.0 -DEPENDS+= ${PYPKGPREFIX}-django>=2.2:../../www/py-django +DEPENDS+= ${PYPKGPREFIX}-django>=2.2:../../www/py-django2 USE_LANGUAGES= # none Index: pkgsrc/www/py-django-treebeard/distinfo diff -u pkgsrc/www/py-django-treebeard/distinfo:1.12 pkgsrc/www/py-django-treebeard/distinfo:1.13 --- pkgsrc/www/py-django-treebeard/distinfo:1.12 Sat Jan 16 09:01:04 2021 +++ pkgsrc/www/py-django-treebeard/distinfo Sat Jan 30 07:23:29 2021 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.12 2021/01/16 09:01:04 adam Exp $ +$NetBSD: distinfo,v 1.13 2021/01/30 07:23:29 mef Exp $ SHA1 (django-treebeard-4.4.tar.gz) = f735ae02fd72a154818df01c997f0ad65e3877d3 RMD160 (django-treebeard-4.4.tar.gz) = b1f2d629819d5fa05d8c7c6079bb5c8b2b4a8692 SHA512 (django-treebeard-4.4.tar.gz) = f2513553ac789f1e8a95629a414aa40243e6ae6259f5fe5a73911184e829e8603c7421103a6b3d5890ef2dabcbad3b23775f5ea73fd21835f457e961b5887081 Size (django-treebeard-4.4.tar.gz) = 310658 bytes +SHA1 (patch-setup.py) = d79034c10d7522bc65e2571c53ef9e3503a65583 Added files: Index: pkgsrc/www/py-django-treebeard/patches/patch-setup.py diff -u /dev/null pkgsrc/www/py-django-treebeard/patches/patch-setup.py:1.1 --- /dev/null Sat Jan 30 07:23:29 2021 +++ pkgsrc/www/py-django-treebeard/patches/patch-setup.py Sat Jan 30 07:23:29 2021 @@ -0,0 +1,29 @@ +$NetBSD: patch-setup.py,v 1.1 2021/01/30 07:23:29 mef Exp $ + +Fix build for py36: + +raceback (most recent call last): + File "setup.py", line 10, in + long_description = fh.read() + File "/usr/pkg/lib/python3.6/encodings/ascii.py", line 26, in decode + return codecs.ascii_decode(input, self.errors)[0] +UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 175: ordinal not in range(128) +*** Error code 1 + +--- setup.py.orig 2021-01-13 18:18:36.000000000 +0900 ++++ setup.py 2021-01-30 16:15:37.800803620 +0900 +@@ -1,12 +1,13 @@ + #!/usr/bin/env python + # -*- coding: utf-8 -*- + import os ++import sys + from setuptools import setup, find_packages + from treebeard import __version__ + import codecs + + +-with open('README.md') as fh: ++with open("README.md", **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as fh: + long_description = fh.read() + + --_----------=_1611991409143700--