From 00ed01b7cb78a5c95f2d71780cad85ac44482a1e Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 25 Jul 2013 14:34:48 -0500 Subject: Moving setup.py.in back to setup.py --- configure.ac | 2 +- setup.py | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ setup.py.in | 108 ----------------------------------------------------------- 3 files changed, 109 insertions(+), 109 deletions(-) create mode 100644 setup.py delete mode 100644 setup.py.in diff --git a/configure.ac b/configure.ac index 3a6a802f..e56a55a5 100644 --- a/configure.ac +++ b/configure.ac @@ -197,6 +197,6 @@ dnl Finish # dnl######### dnl Define the files to be configured -AC_CONFIG_FILES([Makefile setup.py]) +AC_CONFIG_FILES([Makefile]) dnl Generate config.status AC_OUTPUT diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..6e026f30 --- /dev/null +++ b/setup.py @@ -0,0 +1,108 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from setuptools import setup, find_packages +import os +import re + +READMEFILE = "README" +VERSIONFILE = os.path.join("mediagoblin", "_version.py") +VSRE = r"^__version__ = ['\"]([^'\"]*)['\"]" + + +def get_version(): + verstrline = open(VERSIONFILE, "rt").read() + mo = re.search(VSRE, verstrline, re.M) + if mo: + return mo.group(1) + else: + raise RuntimeError("Unable to find version string in %s." % + VERSIONFILE) + + +setup( + name="mediagoblin", + version=get_version(), + packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), + zip_safe=False, + include_package_data = True, + # scripts and dependencies + install_requires=[ + 'setuptools', + 'PasteScript', + 'wtforms', + 'py-bcrypt', + 'pytest>=2.3.1', + 'pytest-xdist', + 'werkzeug>=0.7', + 'celery==2.5.3', + 'kombu==2.1.7', + 'jinja2', + 'sphinx', + 'Babel', + 'argparse', + 'webtest<2', + 'ConfigObj', + 'Markdown', + 'sqlalchemy>=0.8.0', + 'sqlalchemy-migrate', + 'mock', + 'itsdangerous', + 'pytz', + 'six', + ## This is optional! + # 'translitcodec', + ## For now we're expecting that users will install this from + ## their package managers. + # 'lxml', + # 'PIL', + ], + # requires=['gst'], + test_suite='nose.collector', + entry_points="""\ + [console_scripts] + gmg = mediagoblin.gmg_commands:main_cli + pybabel = mediagoblin.babel.messages.frontend:main + + [paste.app_factory] + app = mediagoblin.app:paste_app_factory + + [paste.filter_app_factory] + errors = mediagoblin.errormiddleware:mgoblin_error_middleware + + [zc.buildout] + make_user_dev_dirs = mediagoblin.buildout_recipes:MakeUserDevDirs + + [babel.extractors] + jinja2 = jinja2.ext:babel_extract + """, + license='AGPLv3', + author='Free Software Foundation and contributors', + author_email='cwebber@gnu.org', + url="http://mediagoblin.org/", + download_url="http://mediagoblin.org/download/", + long_description=open(READMEFILE).read(), + classifiers=[ + "Development Status :: 3 - Alpha", + "Environment :: Web Environment", + "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)", + "Operating System :: OS Independent", + "Programming Language :: Python", + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + "Topic :: Internet :: WWW/HTTP :: Dynamic Content" + ], + ) diff --git a/setup.py.in b/setup.py.in deleted file mode 100644 index 10e650b5..00000000 --- a/setup.py.in +++ /dev/null @@ -1,108 +0,0 @@ -# GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -from setuptools import setup, find_packages -import os -import re - -READMEFILE = "README" -VERSIONFILE = os.path.join("mediagoblin", "_version.py") -VSRE = r"^__version__ = ['\"]([^'\"]*)['\"]" - - -def get_version(): - verstrline = open(VERSIONFILE, "rt").read() - mo = re.search(VSRE, verstrline, re.M) - if mo: - return mo.group(1) - else: - raise RuntimeError("Unable to find version string in %s." % - VERSIONFILE) - - -setup( - name="@PACKAGE_NAME@", - version=get_version(), - packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), - zip_safe=False, - include_package_data = True, - # scripts and dependencies - install_requires=[ - 'setuptools', - 'PasteScript', - 'wtforms', - 'py-bcrypt', - 'pytest>=2.3.1', - 'pytest-xdist', - 'werkzeug>=0.7', - 'celery==2.5.3', - 'kombu==2.1.7', - 'jinja2', - 'sphinx', - 'Babel', - 'argparse', - 'webtest<2', - 'ConfigObj', - 'Markdown', - 'sqlalchemy>=0.8.0', - 'sqlalchemy-migrate', - 'mock', - 'itsdangerous', - 'pytz', - 'six', - ## This is optional! - # 'translitcodec', - ## For now we're expecting that users will install this from - ## their package managers. - # 'lxml', - # 'PIL', - ], - # requires=['gst'], - test_suite='nose.collector', - entry_points="""\ - [console_scripts] - gmg = mediagoblin.gmg_commands:main_cli - pybabel = mediagoblin.babel.messages.frontend:main - - [paste.app_factory] - app = mediagoblin.app:paste_app_factory - - [paste.filter_app_factory] - errors = mediagoblin.errormiddleware:mgoblin_error_middleware - - [zc.buildout] - make_user_dev_dirs = mediagoblin.buildout_recipes:MakeUserDevDirs - - [babel.extractors] - jinja2 = jinja2.ext:babel_extract - """, - license='AGPLv3', - author='Free Software Foundation and contributors', - author_email='@PACKAGE_BUGREPORT@', - url="http://mediagoblin.org/", - download_url="http://mediagoblin.org/download/", - long_description=open(READMEFILE).read(), - classifiers=[ - "Development Status :: 3 - Alpha", - "Environment :: Web Environment", - "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)", - "Operating System :: OS Independent", - "Programming Language :: Python", - 'Programming Language :: Python :: 2.6', - 'Programming Language :: Python :: 2.7', - "Topic :: Internet :: WWW/HTTP :: Dynamic Content" - ], - ) -- cgit v1.2.3