Migrate to git and pbr.

No functional changes.

42 files changed, 76 insertions, 46 deletions

diff --git a/.bzrignore b/.gitignore
index d170ccf..29bf745 100644
--- a/.bzrignore
+++ b/.gitignore
@@ -6,3 +6,8 @@ dist
 .testrepository
 __pycache__
 fixtures.egg-info
+*.pyc
+.*.swp
+*~
+AUTHORS
+ChangeLog
diff --git a/HACKING b/HACKING
index 5390cb6..386d3ce 100644
--- a/HACKING
+++ b/HACKING
@@ -7,17 +7,14 @@ Code access
 Branch from the trunk (all patches should be for trunk unless there are
 exceptional circumstances)::
 
-  bzr branch lp:python-fixtures path-to-new-local-branch
+  git clone https://github.com/testing-cabal/fixtures path-to-new-local-repo
 
-Publish your branches whereever you like, I encourage Launchpad hosting though,
-as it can notify the community of new fixtures branches::
-
-  bzr push lp:~YOURUSERNAME/python-fixtures/YOURBRANCHNAME
+Publish your branches whereever you like and submit PR's on github.
 
 Copyright
 +++++++++
 
-Fixtures is Copyright (C) 2010 Robert Collins. I'd like to be able to
+Fixtures is Copyright (C) 2010-2014 Robert Collins. I'd like to be able to
 offer it up for stdlib inclusion once it has proved itself, so am asking for
 copyright assignment to me - or for your contributions to be under the BSD and
 Apache-2.0 licences that Fixtures is under (which permit inclusion in Python).
diff --git a/MANIFEST.in b/MANIFEST.in
index 08cfe4d..a05d469 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,3 @@
-include .bzrignore
 include Apache-2.0
 include BSD
 include COPYING
diff --git a/Makefile b/Makefile
index 7f8fafc..730fbe6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,17 @@
-PYTHONPATH:=$(shell pwd)/lib:${PYTHONPATH}
 PYTHON ?= python
 
 all: check
 
 check:
-	PYTHONPATH=$(PYTHONPATH) $(PYTHON) -m testtools.run \
-	    fixtures.test_suite
+	$(PYTHON) -m testtools.run fixtures.test_suite
 
 clean:
 	find . -name '*.pyc' -print0 | xargs -0 rm -f
 
-TAGS: lib/fixtures/*.py lib/fixtures/tests/*.py
-	ctags -e -R lib/fixtures/
+TAGS: fixtures/*.py fixtures/tests/*.py
+	ctags -e -R fixtures/
 
-tags: lib/fixtures/*.py lib/fixtures/tests/*.py
-	ctags -R lib/fixtures/
+tags: fixtures/*.py fixtures/tests/*.py
+	ctags -R fixtures/
 
 .PHONY: all check clean
diff --git a/NEWS b/NEWS
index bee721d..58a6c54 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ fixtures release notes
 NEXT
 ~~~~
 
+* Fixtures source code is now hosted on
+  `github <https://github.com/testing-cabal/fixtures>`_.
+  (Robert Collins)
+
 0.3.16
 ~~~~~~
 
diff --git a/README b/README
index 776c0c5..e84a2bc 100644
--- a/README
+++ b/README
@@ -28,6 +28,9 @@ Dependencies
 * Python 2.6+
   This is the base language fixtures is written in and for.
 
+* pbr
+  Used for version and release management of fixtures.
+
 * testtools <https://launchpad.net/testtools> 0.9.22 or newer.
   testtools provides helpful glue functions for the details API used to report
   information about a fixture (whether its used in a testing or production
diff --git a/lib/fixtures/__init__.py b/fixtures/__init__.py
index 43925a4..bfbd3dd 100644
--- a/lib/fixtures/__init__.py
+++ b/fixtures/__init__.py
@@ -47,8 +47,8 @@ __all__ = [
     'FakePopen',
     'Fixture',
     'FunctionFixture',
-    'LoggerFixture',
     'LogHandler',
+    'LoggerFixture',
     'MethodFixture',
     'MonkeyPatch',
     'NestedTempfile',
@@ -62,9 +62,13 @@ __all__ = [
     'TestWithFixtures',
     'Timeout',
     'TimeoutException',
+    '__version__',
+    'version',
     ]
 
 
+import pbr.version
+
 from fixtures.fixture import (
     Fixture,
     FunctionFixture,
@@ -93,6 +97,24 @@ from fixtures._fixtures import (
     )
 from fixtures.testcase import TestWithFixtures
 
+# same format as sys.version_info: "A tuple containing the five components of
+# the version number: major, minor, micro, releaselevel, and serial. All
+# values except releaselevel are integers; the release level is 'alpha',
+# 'beta', 'candidate', or 'final'. The version_info value corresponding to the
+# Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
+# releaselevel of 'dev' for unreleased under-development code.
+#
+# If the releaselevel is 'alpha' then the major/minor/micro components are not
+# established at this point, and setup.py will use a version of next-$(revno).
+# If the releaselevel is 'final', then the tarball will be major.minor.micro.
+# Otherwise it is major.minor.micro~$(revno).
+
+# Uncomment when pbr 0.11 is released.
+#_version = pbr.version.VersionInfo('fixtures').semantic_version()
+#__version__ = _version.version_tuple()
+#version = _version.release_string()
+__version__ = (0, 3, 17, 'alpha', 0)
+
 
 def test_suite():
     import fixtures.tests
diff --git a/lib/fixtures/_fixtures/__init__.py b/fixtures/_fixtures/__init__.py
index 1d54858..1d54858 100644
--- a/lib/fixtures/_fixtures/__init__.py
+++ b/fixtures/_fixtures/__init__.py
diff --git a/lib/fixtures/_fixtures/environ.py b/fixtures/_fixtures/environ.py
index 5494429..5494429 100644
--- a/lib/fixtures/_fixtures/environ.py
+++ b/fixtures/_fixtures/environ.py
diff --git a/lib/fixtures/_fixtures/logger.py b/fixtures/_fixtures/logger.py
index e46de3a..e46de3a 100644
--- a/lib/fixtures/_fixtures/logger.py
+++ b/fixtures/_fixtures/logger.py
diff --git a/lib/fixtures/_fixtures/monkeypatch.py b/fixtures/_fixtures/monkeypatch.py
index bfb7351..bfb7351 100644
--- a/lib/fixtures/_fixtures/monkeypatch.py
+++ b/fixtures/_fixtures/monkeypatch.py
diff --git a/lib/fixtures/_fixtures/packagepath.py b/fixtures/_fixtures/packagepath.py
index 43a9bf3..43a9bf3 100644
--- a/lib/fixtures/_fixtures/packagepath.py
+++ b/fixtures/_fixtures/packagepath.py
diff --git a/lib/fixtures/_fixtures/popen.py b/fixtures/_fixtures/popen.py
index 728e980..728e980 100644
--- a/lib/fixtures/_fixtures/popen.py
+++ b/fixtures/_fixtures/popen.py
diff --git a/lib/fixtures/_fixtures/pythonpackage.py b/fixtures/_fixtures/pythonpackage.py
index 4fbd278..4fbd278 100644
--- a/lib/fixtures/_fixtures/pythonpackage.py
+++ b/fixtures/_fixtures/pythonpackage.py
diff --git a/lib/fixtures/_fixtures/pythonpath.py b/fixtures/_fixtures/pythonpath.py
index 89c1968..89c1968 100644
--- a/lib/fixtures/_fixtures/pythonpath.py
+++ b/fixtures/_fixtures/pythonpath.py
diff --git a/lib/fixtures/_fixtures/streams.py b/fixtures/_fixtures/streams.py
index 188d8e3..188d8e3 100644
--- a/lib/fixtures/_fixtures/streams.py
+++ b/fixtures/_fixtures/streams.py
diff --git a/lib/fixtures/_fixtures/tempdir.py b/fixtures/_fixtures/tempdir.py
index 663d3eb..663d3eb 100644
--- a/lib/fixtures/_fixtures/tempdir.py
+++ b/fixtures/_fixtures/tempdir.py
diff --git a/lib/fixtures/_fixtures/temphomedir.py b/fixtures/_fixtures/temphomedir.py
index 2601a8d..2601a8d 100644
--- a/lib/fixtures/_fixtures/temphomedir.py
+++ b/fixtures/_fixtures/temphomedir.py
diff --git a/lib/fixtures/_fixtures/timeout.py b/fixtures/_fixtures/timeout.py
index 7863b0d..7863b0d 100644
--- a/lib/fixtures/_fixtures/timeout.py
+++ b/fixtures/_fixtures/timeout.py
diff --git a/lib/fixtures/callmany.py b/fixtures/callmany.py
index 23580cb..23580cb 100644
--- a/lib/fixtures/callmany.py
+++ b/fixtures/callmany.py
diff --git a/lib/fixtures/fixture.py b/fixtures/fixture.py
index 2cf966d..2cf966d 100644
--- a/lib/fixtures/fixture.py
+++ b/fixtures/fixture.py
diff --git a/lib/fixtures/testcase.py b/fixtures/testcase.py
index 1d6a85c..1d6a85c 100644
--- a/lib/fixtures/testcase.py
+++ b/fixtures/testcase.py
diff --git a/lib/fixtures/tests/__init__.py b/fixtures/tests/__init__.py
index 7ce9e67..5e66653 100644
--- a/lib/fixtures/tests/__init__.py
+++ b/fixtures/tests/__init__.py
@@ -43,5 +43,5 @@ def load_tests(loader, standard_tests, pattern):
         standard_tests.addTests(fixtures.tests._fixtures.load_tests(
             loader, loader.loadTestsFromName('fixtures.tests._fixtures'), pattern))
     doctest.set_unittest_reportflags(doctest.REPORT_ONLY_FIRST_FAILURE)
-    standard_tests.addTest(doctest.DocFileSuite("../../../README"))
+    standard_tests.addTest(doctest.DocFileSuite("../../README"))
     return standard_tests
diff --git a/lib/fixtures/tests/_fixtures/__init__.py b/fixtures/tests/_fixtures/__init__.py
index e4d9403..e4d9403 100644
--- a/lib/fixtures/tests/_fixtures/__init__.py
+++ b/fixtures/tests/_fixtures/__init__.py
diff --git a/lib/fixtures/tests/_fixtures/test_environ.py b/fixtures/tests/_fixtures/test_environ.py
index 64594c9..64594c9 100644
--- a/lib/fixtures/tests/_fixtures/test_environ.py
+++ b/fixtures/tests/_fixtures/test_environ.py
diff --git a/lib/fixtures/tests/_fixtures/test_logger.py b/fixtures/tests/_fixtures/test_logger.py
index 1f69459..1f69459 100644
--- a/lib/fixtures/tests/_fixtures/test_logger.py
+++ b/fixtures/tests/_fixtures/test_logger.py
diff --git a/lib/fixtures/tests/_fixtures/test_monkeypatch.py b/fixtures/tests/_fixtures/test_monkeypatch.py
index 1a84d7f..1a84d7f 100644
--- a/lib/fixtures/tests/_fixtures/test_monkeypatch.py
+++ b/fixtures/tests/_fixtures/test_monkeypatch.py
diff --git a/lib/fixtures/tests/_fixtures/test_packagepath.py b/fixtures/tests/_fixtures/test_packagepath.py
index 6833fdc..6833fdc 100644
--- a/lib/fixtures/tests/_fixtures/test_packagepath.py
+++ b/fixtures/tests/_fixtures/test_packagepath.py
diff --git a/lib/fixtures/tests/_fixtures/test_popen.py b/fixtures/tests/_fixtures/test_popen.py
index 98b762f..98b762f 100644
--- a/lib/fixtures/tests/_fixtures/test_popen.py
+++ b/fixtures/tests/_fixtures/test_popen.py
diff --git a/lib/fixtures/tests/_fixtures/test_pythonpackage.py b/fixtures/tests/_fixtures/test_pythonpackage.py
index 4e2160b..4e2160b 100644
--- a/lib/fixtures/tests/_fixtures/test_pythonpackage.py
+++ b/fixtures/tests/_fixtures/test_pythonpackage.py
diff --git a/lib/fixtures/tests/_fixtures/test_pythonpath.py b/fixtures/tests/_fixtures/test_pythonpath.py
index 5bb6851..5bb6851 100644
--- a/lib/fixtures/tests/_fixtures/test_pythonpath.py
+++ b/fixtures/tests/_fixtures/test_pythonpath.py
diff --git a/lib/fixtures/tests/_fixtures/test_streams.py b/fixtures/tests/_fixtures/test_streams.py
index 68396cd..68396cd 100644
--- a/lib/fixtures/tests/_fixtures/test_streams.py
+++ b/fixtures/tests/_fixtures/test_streams.py
diff --git a/lib/fixtures/tests/_fixtures/test_tempdir.py b/fixtures/tests/_fixtures/test_tempdir.py
index d0def55..d0def55 100644
--- a/lib/fixtures/tests/_fixtures/test_tempdir.py
+++ b/fixtures/tests/_fixtures/test_tempdir.py
diff --git a/lib/fixtures/tests/_fixtures/test_temphomedir.py b/fixtures/tests/_fixtures/test_temphomedir.py
index 339ce2c..339ce2c 100644
--- a/lib/fixtures/tests/_fixtures/test_temphomedir.py
+++ b/fixtures/tests/_fixtures/test_temphomedir.py
diff --git a/lib/fixtures/tests/_fixtures/test_timeout.py b/fixtures/tests/_fixtures/test_timeout.py
index 266e257..266e257 100644
--- a/lib/fixtures/tests/_fixtures/test_timeout.py
+++ b/fixtures/tests/_fixtures/test_timeout.py
diff --git a/lib/fixtures/tests/helpers.py b/fixtures/tests/helpers.py
index ae0d8d3..ae0d8d3 100644
--- a/lib/fixtures/tests/helpers.py
+++ b/fixtures/tests/helpers.py
diff --git a/lib/fixtures/tests/test_callmany.py b/fixtures/tests/test_callmany.py
index 2bf28da..2bf28da 100644
--- a/lib/fixtures/tests/test_callmany.py
+++ b/fixtures/tests/test_callmany.py
diff --git a/lib/fixtures/tests/test_fixture.py b/fixtures/tests/test_fixture.py
index 74e6ad0..74e6ad0 100644
--- a/lib/fixtures/tests/test_fixture.py
+++ b/fixtures/tests/test_fixture.py
diff --git a/lib/fixtures/tests/test_testcase.py b/fixtures/tests/test_testcase.py
index 3f186c5..3f186c5 100644
--- a/lib/fixtures/tests/test_testcase.py
+++ b/fixtures/tests/test_testcase.py
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..61b1d47
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+testtools>=0.9.22
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..2b17f9e
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,27 @@
+[metadata]
+name = fixtures
+summary = Fixtures, reusable state for writing clean tests and more.
+description-file =
+    README
+author = Robert Collins
+author-email = robertc@robertcollins.net
+home-page = https://launchpad.net/python-fixtures
+classifier =
+    Development Status :: 6 - Mature
+    Intended Audience :: Developers
+    License :: OSI Approved :: BSD License
+    License :: OSI Approved :: Apache Software License
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Topic :: Software Development :: Quality Assurance
+    Topic :: Software Development :: Testing
+
+[files]
+packages =
+    fixtures
+
+[entry_points]
+console_scripts =
+    lmirror = l_mirror.main:main
+
diff --git a/setup.py b/setup.py
index 5b89923..b96e399 100755
--- a/setup.py
+++ b/setup.py
@@ -1,33 +1,7 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
-import os.path
+import setuptools
 
-description = open(os.path.join(os.path.dirname(__file__), 'README'), 'rt').read()
-
-setup(name="fixtures",
-      version="0.3.16",
-      description="Fixtures, reusable state for writing clean tests and more.",
-      keywords="fixture fixtures unittest contextmanager",
-      long_description=description,
-      maintainer="Robert Collins",
-      maintainer_email="robertc@robertcollins.net",
-      url="https://launchpad.net/python-fixtures",
-      packages=['fixtures', 'fixtures._fixtures', 'fixtures.tests',
-        'fixtures.tests._fixtures'],
-      package_dir = {'':'lib'},
-      classifiers = [
-          'Development Status :: 6 - Mature',
-          'Intended Audience :: Developers',
-          'License :: OSI Approved :: BSD License',
-          'License :: OSI Approved :: Apache Software License',
-          'Operating System :: OS Independent',
-          'Programming Language :: Python',
-          'Programming Language :: Python :: 3',
-          'Topic :: Software Development :: Quality Assurance',
-          'Topic :: Software Development :: Testing',
-          ],
-      requires = [
-          'testtools',
-          ],
-      )
+setuptools.setup(
+    setup_requires=['pbr'],
+    pbr=True)