# HG changeset patch
# User Laszlo Peter <laszlo.peter@oracle.com>
# Date 1473284909 25200
# Node ID 8c9207b54acf517d0d99d0b734988d941fbbb7ba
# Parent  a2032b82c1221b93f22c210c7416b98b72256c00
23206550 Upgrade fixtures to 1.4.0

diff -r a2032b82c122 -r 8c9207b54acf components/python/fixtures/Makefile
--- a/components/python/fixtures/Makefile	Wed Sep 07 14:48:29 2016 -0700
+++ b/components/python/fixtures/Makefile	Wed Sep 07 14:48:29 2016 -0700
@@ -26,19 +26,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		fixtures
-COMPONENT_VERSION=	1.0.0
+COMPONENT_VERSION=	1.4.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:4494c4862ad99ffb8354f7456f1c9a4ba68b607d9dabb912999d4ad60c7d9f54
+    sha256:3e1c61753d0fafc1429591d33ad6b828a0673a200eae63dd6ac0685479db5d36
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
-COMPONENT_PROJECT_URL=	https://launchpad.net/python-fixtures
+COMPONENT_PROJECT_URL=	https://github.com/testing-cabal/fixtures
 COMPONENT_BUGDB=	python-mod/fixtures
 
-TPNO=		26001
-
-# Depends on testtools which is not Python 3 ready.
-PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
+TPNO=			28000
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -51,4 +48,13 @@
 
 install:	$(INSTALL_NO_ARCH)
 
-test:		$(NO_TESTS)
+# Run the tests in the build directory so as not to touch the source directory.
+# The tests are copied over during the build, so we don't have to do that now.
+COMPONENT_TEST_DIR = $(@D)
+COMPONENT_TEST_CMD = py.test-$(PYTHON_VERSION)
+COMPONENT_TEST_ARGS = --result-log=$(COMPONENT_TEST_OUTPUT)
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+
+test:		$(TEST_NO_ARCH)
+
+system-test:	$(NO_TESTS)
diff -r a2032b82c122 -r 8c9207b54acf components/python/fixtures/fixtures-PYVER.p5m
--- a/components/python/fixtures/fixtures-PYVER.p5m	Wed Sep 07 14:48:29 2016 -0700
+++ b/components/python/fixtures/fixtures-PYVER.p5m	Wed Sep 07 14:48:29 2016 -0700
@@ -43,12 +43,14 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/fixtures-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/_fixtures/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/_fixtures/environ.py
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/_fixtures/logger.py
+file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/_fixtures/mockpatch.py
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/_fixtures/monkeypatch.py
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/_fixtures/packagepath.py
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/_fixtures/popen.py
@@ -58,6 +60,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/_fixtures/tempdir.py
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/_fixtures/temphomedir.py
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/_fixtures/timeout.py
+file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/_fixtures/warnings.py
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/callmany.py
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/fixture.py
 file path=usr/lib/python$(PYVER)/vendor-packages/fixtures/testcase.py
@@ -68,9 +71,18 @@
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
+# force a dependency on extras; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/extras-$(PYV)
+
 # force a dependency on the fixtures package
 depend type=require \
     fmri=library/python/fixtures@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
+# force a dependency on pbr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pbr-$(PYV)
+
+# force a dependency on six; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/six-$(PYV)
+
 # force a dependency on testtools; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/testtools-$(PYV)