From b2149c8e73d0f65e7bb21b9707051682aa8fcd6c Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Mon, 20 Jul 2015 09:56:07 -0600 Subject: [PATCH] Remove translations automation in setup.py. Fixes GH-178, GH-179. --- CHANGES.rst | 3 +++ setup.py | 53 ++++------------------------------------------------- 2 files changed, 7 insertions(+), 49 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index fbc92fc..736756b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,9 @@ CHANGES master (unreleased) ------------------- +* Remove all translation-related automation in `setup.py`. Fixes GH-178 and + GH-179. Thanks Joe Weiss, Matt Molyneaux, and others for the reports. + 2.3 (2015.07.17) ---------------- diff --git a/setup.py b/setup.py index 40d8e9b..a1b49b6 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,5 @@ from os.path import join from setuptools import setup, find_packages -from setuptools.command.install_lib import install_lib as _install_lib -from distutils.command.build import build as _build -from distutils.cmd import Command long_description = (open('README.rst').read() + @@ -16,47 +13,6 @@ def get_version(): if line.startswith('__version__ ='): return line.split('=')[1].strip().strip('"\'') - -class compile_translations(Command): - """command tries to compile messages via django compilemessages, does not - interrupt setup if gettext is not installed""" - - description = 'compile message catalogs to MO files via django compilemessages' - user_options = [] - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - import os - import sys - - from django.core.management import execute_from_command_line, CommandError - - curdir = os.getcwd() - os.chdir(os.path.realpath('model_utils')) - - try: - execute_from_command_line(['django-admin', 'compilemessages']) - except CommandError: - # raised if gettext pkg is not installed - pass - finally: - os.chdir(curdir) - - -class build(_build): - sub_commands = [('compile_translations', None)] + _build.sub_commands - - -class install_lib(_install_lib): - def run(self): - self.run_command('compile_translations') - _install_lib.run(self) - setup( name='django-model-utils', version=get_version(), @@ -84,10 +40,9 @@ setup( zip_safe=False, tests_require=["Django>=1.4.2"], test_suite='runtests.runtests', - setup_requires=['Django>=1.4.2'], - package_data = { - 'model_utils': ['locale/*/LC_MESSAGES/django.po','locale/*/LC_MESSAGES/django.mo'], + package_data={ + 'model_utils': [ + 'locale/*/LC_MESSAGES/django.po','locale/*/LC_MESSAGES/django.mo' + ], }, - cmdclass={'build': build, 'install_lib': install_lib, - 'compile_translations': compile_translations} )