Index: head/devel/py-virtualenv/Makefile
===================================================================
--- head/devel/py-virtualenv/Makefile
+++ head/devel/py-virtualenv/Makefile
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	virtualenv
-PORTVERSION=	12.0.7
-PORTREVISION=	0
+PORTVERSION=	13.0.3
 CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
@@ -12,15 +10,18 @@
 
 LICENSE=	MIT
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_GITHUB=	yes
+USE_PYTHON=	autoplist concurrent distutils
+
+GH_ACCOUNT=	pypa
 
 .include <bsd.port.options.mk>
 
@@ -36,6 +37,6 @@
 .endif
 
 regression-test: build
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
Index: head/devel/py-virtualenv/distinfo
===================================================================
--- head/devel/py-virtualenv/distinfo
+++ head/devel/py-virtualenv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (virtualenv-12.0.7.tar.gz) = d681db1766cdc8aa1b37eb18252c264b775f971166c2bf658a9618c1f3d28741
-SIZE (virtualenv-12.0.7.tar.gz) = 1829757
+SHA256 (pypa-virtualenv-13.0.3_GH0.tar.gz) = 5b9ae6a5417173c7a1441ac85d462ce4e1b308bd410dd5aa89694b98b323f7af
+SIZE (pypa-virtualenv-13.0.3_GH0.tar.gz) = 1711711
Index: head/devel/py-virtualenv/files/patch-setup.py
===================================================================
--- head/devel/py-virtualenv/files/patch-setup.py
+++ head/devel/py-virtualenv/files/patch-setup.py
@@ -0,0 +1,24 @@
+From 1f137150f8d4e01386c8c8ffacdcf5e556cea427 Mon Sep 17 00:00:00 2001
+Date: Sun, 21 Jun 2015 14:52:38 +1000
+Subject: [PATCH] Fix test command invocation causing ERROR
+https://patch-diff.githubusercontent.com/raw/pypa/virtualenv/pull/773.patch
+
+--- setup.py.orig	2015-06-02 01:37:48 UTC
++++ setup.py
+@@ -15,7 +15,7 @@ try:
+ 
+         def initialize_options(self):
+             TestCommand.initialize_options(self)
+-            self.pytest_args = None
++            self.pytest_args = []
+ 
+         def finalize_options(self):
+             TestCommand.finalize_options(self)
+@@ -32,7 +32,6 @@ try:
+         'entry_points': {
+             'console_scripts': [
+                 'virtualenv=virtualenv:main',
+-                'virtualenv-%s.%s=virtualenv:main' % sys.version_info[:2]
+             ],
+         },
+         'zip_safe': False,