Merge pull request #1 from markmc/master

Some tiny fixes
2014-02-14 10:06:00 -05:00 · 2014-02-14 10:06:00 -05:00 · eb461bc6b5
commit eb461bc6b5
parent 40b1d4c690 38ecc4c6d2
5 changed files with 0 additions and 17 deletions
--- a/babel.cfg
+++ b/babel.cfg
@ -1 +0,0 @@
-[python: **.py]
--- a/oslo/test/base.py
+++ b/oslo/test/base.py
@ -35,7 +35,6 @@ class BaseTestCase(testtools.TestCase):
        self._fake_logs()
        self.useFixture(fixtures.NestedTempfile())
        self.useFixture(fixtures.TempHomeDir())
-        self.tempdirs = []

    def _set_timeout(self):
        test_timeout = os.environ.get('OS_TEST_TIMEOUT', 0)
--- a/oslo/test/fixture/init.py
+++ b/oslo/test/fixture/init.py
--- a/requirements.txt
+++ b/requirements.txt
@ -1,4 +1,3 @@
 fixtures>=0.3.14
 testtools>=0.9.32
 mock>=1.0
-Babel>=0.9.6
--- a/setup.cfg
+++ b/setup.cfg
@ -37,17 +37,3 @@ all_files = 1

 [upload_sphinx]
 upload-dir = doc/build/html
-
-[compile_catalog]
-directory = oslo.test/locale
-domain = oslo.test
-
-[update_catalog]
-domain = oslo.test
-output_dir = oslo.test/locale
-input_file = oslo.test/locale/oslo.test.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = oslo.test/locale/oslo.test.pot