From 91b2583ac7ce5c12e16590384886742fe785a0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 18 Aug 2015 16:18:29 +0200 Subject: [PATCH] misc: sync setup stuff with newer templates --- MANIFEST.in | 16 +++-- README | 2 +- setup.py | 172 +++++++++++++++++++++++----------------------------- 3 files changed, 88 insertions(+), 102 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index bb63e69..173e857 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,8 +1,12 @@ -recursive-include fargo/templates *.html -recursive-include fargo/static *.gif *.png *.css *.ttf *.js +# locales recursive-include fargo/locale *.po *.mo -recursive-include fargo/fargo/templates *.html -recursive-include fargo/fargo/static *.gif *.png *.css *.ttf *.js -recursive-include fargo/fargo/locale *.po *.mo + +# static +recursive-include fargo/static *.gif *.png *.css *.js + +# templates +recursive-include fargo/templates *.html + +include COPYING README +include MANIFEST.in include VERSION -include COPYING diff --git a/README b/README index 95c050c..94164b4 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ Fargo -============ +===== To start do: diff --git a/setup.py b/setup.py index c082a3e..4d97d3e 100755 --- a/setup.py +++ b/setup.py @@ -1,15 +1,43 @@ #! /usr/bin/env python +# -*- coding: utf-8 -*- -''' Setup script for fargo -''' - +import glob import os +import re import subprocess -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.command.sdist import sdist as _sdist +from distutils.command.sdist import sdist from distutils.cmd import Command +from setuptools import setup, find_packages + +class eo_sdist(sdist): + def run(self): + if os.path.exists('VERSION'): + os.remove('VERSION') + version = get_version() + version_file = open('VERSION', 'w') + version_file.write(version) + version_file.close() + sdist.run(self) + if os.path.exists('VERSION'): + os.remove('VERSION') + +def get_version(): + if os.path.exists('VERSION'): + version_file = open('VERSION', 'r') + version = version_file.read() + version_file.close() + return version + if os.path.exists('.git'): + p = subprocess.Popen(['git', 'describe', '--dirty', '--match=v*'], stdout=subprocess.PIPE) + result = p.communicate()[0] + if p.returncode == 0: + version = result.split()[0][1:] + version = version.replace('-', '.') + return version + return '0' class compile_translations(Command): description = 'compile message catalogs to MO files via django compilemessages' @@ -22,105 +50,59 @@ class compile_translations(Command): pass def run(self): - from django.core.management import call_command - for path in ['fargo']: - if path.endswith('.py'): - continue - curdir = os.getcwd() - os.chdir(os.path.realpath(path)) - call_command('compilemessages') - os.chdir(curdir) + try: + from django.core.management import call_command + for path, dirs, files in os.walk('fargo'): + if 'locale' not in dirs: + continue + curdir = os.getcwd() + os.chdir(os.path.realpath(path)) + call_command('compilemessages') + os.chdir(curdir) + except ImportError: + sys.stderr.write('!!! Please install Django >= 1.4 to build translations\n') + class build(_build): sub_commands = [('compile_translations', None)] + _build.sub_commands -class sdist(_sdist): - sub_commands = [('compile_translations', None)] + _sdist.sub_commands - - def run(self): - print "creating VERSION file" - if os.path.exists('VERSION'): - os.remove('VERSION') - version = get_version() - version_file = open('VERSION', 'w') - version_file.write(version) - version_file.close() - _sdist.run(self) - print "removing VERSION file" - if os.path.exists('VERSION'): - os.remove('VERSION') class install_lib(_install_lib): def run(self): self.run_command('compile_translations') _install_lib.run(self) -def get_version(): - '''Use the VERSION, if absent generates a version with git describe, if not - tag exists, take 0.0.0- and add the length of the commit log. - ''' - if os.path.exists('VERSION'): - with open('VERSION', 'r') as v: - return v.read() - if os.path.exists('.git'): - p = subprocess.Popen(['git','describe','--dirty','--match=v*'], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - result = p.communicate()[0] - if p.returncode == 0: - return result.split()[0][1:].replace('-', '.') - else: - return '0.0.0-%s' % len( - subprocess.check_output( - ['git', 'rev-list', 'HEAD']).splitlines()) - return '0.0.0' - -setup(name="fargo", - version=get_version(), - license="AGPLv3 or later", - description="", - long_description=file('README').read(), - url="http://dev.entrouvert.org/projects/fargo/", - author="Entr'ouvert", - author_email="info@entrouvert.org", - scripts=['manage.py',], - include_package_data=True, - packages=find_packages(), - install_requires=[ - 'django>=1.7', - 'django-tables2', - 'gadjo', - 'XStatic', - 'XStatic_jQuery', - ], - setup_requires=[ - ], - tests_require=[ - 'nose>=0.11.4', - ], - package_data={ - '': [ - 'locale/*/*/*.po', - 'locale/*/*/*.mo', - 'templates/*.html', - 'templates/*/*.html', - 'templates/*/*/*.html', - 'static/*/*/*.css', - 'static/*/*.css', - 'static/*/*/*.png', - 'static/*/*.png', - 'static/*/*/*.gif', - 'static/*/*.gif', - 'static/*/*/*.js', - 'static/*/*.js', - 'static/*/*/*.ttf', - 'static/*/*.ttf', - ], - }, - cmdclass={ - 'build': build, - 'install_lib': install_lib, - 'compile_translations': compile_translations, - 'sdist': sdist, - }, +setup( + name='fargo', + version=get_version(), + description='Document Box', + long_description=open('README').read(), + author="Entr'ouvert", + author_email='info@entrouvert.com', + packages=find_packages(), + include_package_data=True, + scripts=('manage.py',), + url='https://dev.entrouvert.org/projects/fargo/', + classifiers=[ + 'Development Status :: 2 - Pre-Alpha', + 'Environment :: Web Environment', + 'Framework :: Django', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2', + ], + install_requires=['django>=1.7', + 'gadjo', + 'django-tables2', + ], + zip_safe=False, + cmdclass={ + 'build': build, + 'compile_translations': compile_translations, + 'install_lib': install_lib, + 'sdist': eo_sdist, + }, )