Attachment #213073 for bug #245359

View | Details | Raw Unified | Return to bug 245359
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	django-photologue
PORTVERSION=	3.11
PORTREVISION=	2
CATEGORIES=	www python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


LICENSE=	BSD3CLAUSE

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=3.0.0:www/py-django-sortedm2m@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=1.5.0:www/py-django-sortedm2m@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} \
		${PY_PILLOW}

USES=		python:3.5+
USES=		python
USE_PYTHON=	autoplist distutils

NO_ARCH=	yes

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)www/py-django-photologue/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1521279233	1	TIMESTAMP = 1585989760
2	SHA256 (django-photologue-3.8.1.tar.gz) = 2a8b19e98d6cceb1fd254561821c9815d49cc449e3e89f8812da25062b1d2ea1	2	SHA256 (django-photologue-3.11.tar.gz) = 81c3caa3afc142ecab493ea30f1b35be304468893da973cc53f0f6eba60a7667
3	SIZE (django-photologue-3.8.1.tar.gz) = 173045	3	SIZE (django-photologue-3.11.tar.gz) = 179139




--- 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",




# $FreeBSD$

PORTNAME=	django-sortedm2m
PORTVERSION=	3.0.0
PORTREVISION=	1
CATEGORIES=	www python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	ports@caomhin.org

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE.txt

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR}

USES=		python:3.5+
USE_GITHUB=	yes
GH_ACCOUNT=	jazzband
USE_PYTHON=	distutils autoplist

NO_ARCH=	yes

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)www/py-django-sortedm2m/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1520711306	1	TIMESTAMP = 1585989999
2	SHA256 (django-sortedm2m-1.5.0.tar.gz) = 52942b5295efcf252b6bbff58be70365d9f5d59d2e6d0f1bf9d9f2d0dbef4814	2	SHA256 (jazzband-django-sortedm2m-3.0.0_GH0.tar.gz) = 0d4a93124ac40e29017187aa275b51ffe0cb150c9f717f0e931b6abd0b20a6f6
3	SIZE (django-sortedm2m-1.5.0.tar.gz) = 37985	3	SIZE (jazzband-django-sortedm2m-3.0.0_GH0.tar.gz) = 42890

Return to bug 245359

Lines 2-9 Link Here

(-)www/py-django-photologue/Makefile (-7 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= django-photologue	4	PORTNAME= django-photologue
5	PORTVERSION= 3.8.1	5	PORTVERSION= 3.11
6	PORTREVISION= 2
7	CATEGORIES= www python	6	CATEGORIES= www python
8	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 13-26 Link Here
13		12
14	LICENSE= BSD3CLAUSE	13	LICENSE= BSD3CLAUSE
15		14
16	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}	15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \
17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \	16	${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=3.0.0:www/py-django-sortedm2m@${PY_FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=1.5.0:www/py-django-sortedm2m@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} \	17	${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} \
20	${PY_PILLOW}	18	${PY_PILLOW}
21		19
22	NO_ARCH= yes	20	USES= python:3.5+
23	USES= python
24	USE_PYTHON= autoplist distutils	21	USE_PYTHON= autoplist distutils
25		22
		23	NO_ARCH= yes
		24
26	.include <bsd.port.mk>	25	.include <bsd.port.mk>

Lines 1-31 Link Here

(-)www/py-django-photologue/files/patch-setup.py (-31 lines)
1	--- setup.py.orig 2019-06-24 21:32:20 UTC
2	+++ setup.py
3	@@ -2,25 +2,15 @@
4	import uuid
5	import os
6	from setuptools import setup, find_packages
7	-from pip.req import parse_requirements
8	+from pkg_resources import parse_requirements
9
10	import photologue
11
12
13	def get_requirements(source):
14	+ with open(source) as f:
15	+ return sorted({str(req) for req in parse_requirements(f.read())})
16
17	- try:
18	- install_reqs = parse_requirements(source, session=uuid.uuid1())
19	- except TypeError:
20	- # Older version of pip.
21	- install_reqs = parse_requirements(source)
22	- required = list(set([str(ir.req) for ir in install_reqs]))
23	-
24	- # Temp situation: transition from PIL to Pillow, add a hook so people can
25	- # skip installing Pillow.
26	- if os.path.exists('/tmp/PHOTOLOGUE_NO_PILLOW'):
27	- required = [item for item in required if not item.startswith('Pillow')]
28	- return required
29
30	setup(
31	name="django-photologue",

Lines 2-11 Link Here

(-)www/py-django-sortedm2m/Makefile (-6 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= django-sortedm2m	4	PORTNAME= django-sortedm2m
5	PORTVERSION= 1.5.0	5	PORTVERSION= 3.0.0
6	PORTREVISION= 1
7	CATEGORIES= www python	6	CATEGORIES= www python
8	MASTER_SITES= CHEESESHOP
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
10		8
11	MAINTAINER= ports@caomhin.org	9	MAINTAINER= ports@caomhin.org
Lines 14-23 Link Here
14	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
15	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	13	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
16		14
17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR}	15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR}
18		16
19	NO_ARCH= yes	17	USES= python:3.5+
20	USES= python	18	USE_GITHUB= yes
		19	GH_ACCOUNT= jazzband
21	USE_PYTHON= distutils autoplist	20	USE_PYTHON= distutils autoplist
22		21
		22	NO_ARCH= yes
		23
23	.include <bsd.port.mk>	24	.include <bsd.port.mk>