Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

devel/py-tox: Only depend on py-argparse with Python 2.6, 3.0 and 3.1

The argparse module is part of the standard library in 2.7 and 3.2 onward.
Until this change, argparse has been incorrectly depended on for users
running Python 2.7.

- Update conditional expression in RUN_DEPENDS for argparse

While I'm here:

- Enable STAGE support
- Enable AUTOPLIST, remove pkg-plist accordingly
  • Loading branch information...
commit 1f57facbf54526d07fda0604abe7f6682d575540 1 parent 93821de
@koobs koobs authored
Showing with 2 additions and 52 deletions.
  1. +2 −2 devel/py-tox/Makefile
  2. +0 −50 devel/py-tox/pkg-plist
View
4 devel/py-tox/Makefile
@@ -17,12 +17,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.9.1:${PORTSDIR}/devel/py-virtu
USE_PYTHON= yes
USE_PYDISTUTILS= easy_install
+PYDISTUTILS_AUTOPLIST= yes
OPTIONS_DEFINE= PYTEST
PYTEST_DESC= Include the pytest test runner
OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPYTEST}
@@ -31,7 +31,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
.include <bsd.port.pre.mk>
-.if ${PYTHON_VER} <= 3.2
+.if ${PYTHON_REL} != 2.7 && ${PYTHON_REL} < 3.2
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse
.endif
View
50 devel/py-tox/pkg-plist
@@ -1,50 +0,0 @@
-@comment $FreeBSD$
-bin/tox
-bin/tox-quickstart
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_cmdline.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_cmdline.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_cmdline.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_exception.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_exception.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_exception.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_pytestplugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_pytestplugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_pytestplugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_quickstart.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_quickstart.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_quickstart.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_venv.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_venv.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_venv.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_verlib.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_verlib.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/_verlib.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/interpreters.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/interpreters.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/interpreters.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/result.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/result.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/result.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/vendor/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/vendor/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/vendor/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/vendor/virtualenv.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/vendor/virtualenv.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/vendor/virtualenv.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox/vendor
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tox
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
Please sign in to comment.
Something went wrong with that request. Please try again.