Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Oct 2015 06:38:42 +0000 (UTC)
From:      Kubilay Kocak <koobs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r400443 - in head/www/py-django-mezzanine: . files
Message-ID:  <201510290638.t9T6cg2F084484@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: koobs
Date: Thu Oct 29 06:38:42 2015
New Revision: 400443
URL: https://svnweb.freebsd.org/changeset/ports/400443

Log:
  www/py-django-mezzanine: Fix run dependency versions
  
  Loosen the dependencies listed in setup.py:install_requires so that
  port dependencies can satisfy them. This fixes run-time errors such as:
  
  pkg_resources.DistributionNotFound: The 'future==0.9.0' distribution was not found and is required by Mezzanine
  
   - Update and sort RUN_DEPENDS, remove chardet
   - Add TEST_DEPENDS
   - Rename test target now that framework supports TEST_DEPENDS et al.
   - Update test target to set some environment variables that if not set
     can cause test failures in particular environments.
  
  PR:		200994
  MFH:		2015Q4

Added:
  head/www/py-django-mezzanine/files/
  head/www/py-django-mezzanine/files/patch-setup.py   (contents, props changed)
Modified:
  head/www/py-django-mezzanine/Makefile

Modified: head/www/py-django-mezzanine/Makefile
==============================================================================
--- head/www/py-django-mezzanine/Makefile	Thu Oct 29 06:12:50 2015	(r400442)
+++ head/www/py-django-mezzanine/Makefile	Thu Oct 29 06:38:42 2015	(r400443)
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-mezzanine
 PORTVERSION=	3.1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,24 +15,26 @@ COMMENT=	Content management platform bui
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>1.6:${PORTSDIR}/www/py-django \
-		${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:${PORTSDIR}/www/py-django-contrib-comments \
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django16 \
+		${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.3.4:${PORTSDIR}/www/py-django-mezzanine-filebrowser \
+		${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.3.12:${PORTSDIR}/www/py-django-mezzanine-grappelli \
+		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:${PORTSDIR}/devel/py-tzlocal \
 		${PYTHON_PKGNAMEPREFIX}bleach>=1.4:${PORTSDIR}/www/py-bleach \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.1.3:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}chardet>0:${PORTSDIR}/textproc/py-chardet \
-		${PYTHON_PKGNAMEPREFIX}future>=0.9.0:${PORTSDIR}/devel/py-future \
-		${PYTHON_PKGNAMEPREFIX}pillow>=1.3.1:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:${PORTSDIR}/www/py-requests \
 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4:${PORTSDIR}/www/py-requests-oauthlib \
+		${PYTHON_PKGNAMEPREFIX}future>=0.9.0:${PORTSDIR}/devel/py-future \
+		${PYTHON_PKGNAMEPREFIX}pillow>=1.3.1:${PORTSDIR}/graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:${PORTSDIR}/www/py-django-contrib-comments \
 		${PYTHON_PKGNAMEPREFIX}south>=0.7.3:${PORTSDIR}/databases/py-south \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:${PORTSDIR}/devel/py-tzlocal \
-		${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.3.4:${PORTSDIR}/www/py-django-mezzanine-filebrowser \
-		${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.3.12:${PORTSDIR}/www/py-django-mezzanine-grappelli
+
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:${PORTSDIR}/devel/pep8 \
+		${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:${PORTSDIR}/devel/py-pyflakes
 
 USES=		gettext python
 USE_PYTHON=	autoplist distutils
 
-regression-test: build
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+do-test:
+	@cd ${WRKSRC} && ${SETENV} TZ=UTC LC_ALL=en_US.UTF-8 ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>

Added: head/www/py-django-mezzanine/files/patch-setup.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/py-django-mezzanine/files/patch-setup.py	Thu Oct 29 06:38:42 2015	(r400443)
@@ -0,0 +1,27 @@
+--- setup.py.orig	2014-08-11 10:12:36 UTC
++++ setup.py
+@@ -53,12 +53,12 @@ try:
+             "django >= 1.4.10, != 1.6.0, < 1.7",
+             "filebrowser_safe >= 0.3.4",
+             "grappelli_safe >= 0.3.12",
+-            "tzlocal == 1.0",
++            "tzlocal >= 1.0",
+             "bleach >= 1.4",
+-            "beautifulsoup4 == 4.1.3",
++            "beautifulsoup4 >= 4.1.3",
+             "requests >= 2.1.0",
+             "requests-oauthlib >= 0.4",
+-            "future == 0.9.0",
++            "future >= 0.9.0",
+             "pillow",
+         ],
+         entry_points="""
+@@ -66,7 +66,7 @@ try:
+             mezzanine-project=mezzanine.bin.mezzanine_project:create_project
+         """,
+         test_suite="mezzanine.bin.runtests.main",
+-        tests_require=["pyflakes==0.6.1", "pep8==1.4.1"],
++        tests_require=["pyflakes>=0.6.1", "pep8>=1.4.1"],
+         classifiers=[
+             "Development Status :: 5 - Production/Stable",
+             "Environment :: Web Environment",



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510290638.t9T6cg2F084484>