From owner-svn-ports-head@freebsd.org Sat Jun 29 08:56:02 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54BC615D7DA9; Sat, 29 Jun 2019 08:56:02 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EAC4B6E551; Sat, 29 Jun 2019 08:56:01 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C59E9C18B; Sat, 29 Jun 2019 08:56:01 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5T8u10I093514; Sat, 29 Jun 2019 08:56:01 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5T8u1il093513; Sat, 29 Jun 2019 08:56:01 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201906290856.x5T8u1il093513@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 29 Jun 2019 08:56:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505332 - head/www/py-django-photologue/files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: head/www/py-django-photologue/files X-SVN-Commit-Revision: 505332 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EAC4B6E551 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jun 2019 08:56:02 -0000 Author: swills Date: Sat Jun 29 08:56:01 2019 New Revision: 505332 URL: https://svnweb.freebsd.org/changeset/ports/505332 Log: www/py-django-photologue: make compatible with upcoming pip 19.1.1 PR: 238793 Approved by: Kevin Golding (maintainer) Added: head/www/py-django-photologue/files/ head/www/py-django-photologue/files/patch-setup.py (contents, props changed) Added: head/www/py-django-photologue/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-django-photologue/files/patch-setup.py Sat Jun 29 08:56:01 2019 (r505332) @@ -0,0 +1,31 @@ +--- setup.py.orig 2019-06-24 21:32:20 UTC ++++ setup.py +@@ -2,25 +2,15 @@ + import uuid + import os + from setuptools import setup, find_packages +-from pip.req import parse_requirements ++from pkg_resources import parse_requirements + + import photologue + + + def get_requirements(source): ++ with open(source) as f: ++ return sorted({str(req) for req in parse_requirements(f.read())}) + +- try: +- install_reqs = parse_requirements(source, session=uuid.uuid1()) +- except TypeError: +- # Older version of pip. +- install_reqs = parse_requirements(source) +- required = list(set([str(ir.req) for ir in install_reqs])) +- +- # Temp situation: transition from PIL to Pillow, add a hook so people can +- # skip installing Pillow. +- if os.path.exists('/tmp/PHOTOLOGUE_NO_PILLOW'): +- required = [item for item in required if not item.startswith('Pillow')] +- return required + + setup( + name="django-photologue",