--- a/components/python/pytest/pytest-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pytest/pytest-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pytest-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pytest-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python testing tool"
set name=pkg.description \
value="The Python py.test testing tool makes it easy to write small tests, yet scales to support complex functional testing."
@@ -78,6 +78,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pytest.py
license pytest.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pytest-$(PYV)@2.3.5,5.11-0.175.3.0.0.16.0
+
# force a dependency on the pytest package
depend type=require \
- fmri=library/python-2/pytest@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pytest@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)