diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-17 17:52:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-17 17:52:22 +0000 |
| commit | 63cf95634395dc37bdd46fa7b7dfdbf47592d42a (patch) | |
| tree | e98ffdd414ed6bc002f02d3bba3a622c3e7c079d | |
| parent | 895176203640d2608062fab26efc6e8120e11b21 (diff) | |
| parent | 4a4c274c834728a03bce7e5384c562321821eaf8 (diff) | |
| download | nova-63cf95634395dc37bdd46fa7b7dfdbf47592d42a.tar.gz nova-63cf95634395dc37bdd46fa7b7dfdbf47592d42a.tar.xz nova-63cf95634395dc37bdd46fa7b7dfdbf47592d42a.zip | |
Merge "Get rid of distutils.extra."
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | babel.cfg | 2 | ||||
| -rw-r--r-- | setup.cfg | 23 | ||||
| -rw-r--r-- | setup.py | 16 | ||||
| -rw-r--r-- | tools/pip-requires | 1 |
5 files changed, 28 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore index 64a96d0a8..a3ee55e46 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,4 @@ nova.egg-info .venv *.sqlite *.log -po/*.pot
\ No newline at end of file +po/*.pot diff --git a/babel.cfg b/babel.cfg new file mode 100644 index 000000000..15cd6cb76 --- /dev/null +++ b/babel.cfg @@ -0,0 +1,2 @@ +[python: **.py] + @@ -7,3 +7,26 @@ source-dir = doc/source tag_build = tag_date = 0 tag_svn_revision = 0 + +[compile_catalog] +directory = locale +domain = nova + +[update_catalog] +domain = nova +output_dir = po +input_file = po/nova.pot + +[extract_messages] +keywords = _ gettext ngettext +mapping_file = babel.cfg +output_file = po/nova.pot + +[nosetests] +verbosity=2 +detailed-errors=1 +with-openstack=1 +openstack-red=0.05 +openstack-yellow=0.025 +openstack-show-elapsed=1 +openstack-color=1 @@ -16,26 +16,12 @@ # License for the specific language governing permissions and limitations # under the License. -import gettext import glob import os from setuptools import find_packages -# In order to run the i18n commands for compiling and -# installing message catalogs, we use DistUtilsExtra. -# Don't make this a hard requirement, but warn that -# i18n commands won't be available if DistUtilsExtra is -# not installed... -try: - from DistUtilsExtra.auto import setup -except ImportError: - from setuptools import setup - print "Warning: DistUtilsExtra required to use i18n builders. " - print "To build nova with support for message catalogs, you need " - print " https://launchpad.net/python-distutils-extra >= 2.18" - -gettext.install('nova', unicode=1) +from setuptools import setup from nova import version diff --git a/tools/pip-requires b/tools/pip-requires index 409e58bd5..2b691ad73 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -32,3 +32,4 @@ nosexcover paramiko feedparser pycrypto +Babel>=0.9.6 |