From 31a8ff428869614db3cae06ab24dbdb1e3d98064 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 17 Jul 2010 11:33:08 -0500 Subject: Initial mediagoblin structure --- setup.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 setup.py (limited to 'setup.py') diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..c19e801f --- /dev/null +++ b/setup.py @@ -0,0 +1,17 @@ +from setuptools import setup, find_packages + +import sys + +setup( + name = "mediagoblin", + version = "0.0.1", + packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), + zip_safe=False, + license = 'AGPLv3', + author = 'Christopher Webber', + author_email = 'cwebber@dustycloud.org', + entry_points = """\ + [paste.app_factory] + mediagoblin = mediagoblin.app:paste_app_factory + """, + ) -- cgit v1.2.3 From 0c04118b76ff087949afcb6e4213b82820f10642 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 24 Mar 2011 19:00:55 -0500 Subject: Adding requirements :) --- setup.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c19e801f..617bb3f6 100644 --- a/setup.py +++ b/setup.py @@ -7,11 +7,22 @@ setup( version = "0.0.1", packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), zip_safe=False, + # scripts and dependencies + install_requires = [ + 'setuptools', + 'PasteScript', + 'beaker', + 'routes', + 'pymongo', + 'webob', + 'wtforms', + ], + license = 'AGPLv3', author = 'Christopher Webber', author_email = 'cwebber@dustycloud.org', entry_points = """\ [paste.app_factory] - mediagoblin = mediagoblin.app:paste_app_factory + app = mediagoblin.app:paste_app_factory """, ) -- cgit v1.2.3 From 508775bd2360c441bde1045bc89abe4152e72650 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 24 Mar 2011 19:54:06 -0500 Subject: Requiring mongokit --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 617bb3f6..e6c784d2 100644 --- a/setup.py +++ b/setup.py @@ -14,6 +14,7 @@ setup( 'beaker', 'routes', 'pymongo', + 'mongokit', 'webob', 'wtforms', ], -- cgit v1.2.3 From e5572c607726599ccbf66a40194b96d12584f38f Mon Sep 17 00:00:00 2001 From: Matt Lee Date: Sun, 27 Mar 2011 18:47:23 -0400 Subject: Added copyright notices --- setup.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e6c784d2..1f9f852d 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,19 @@ +# GNU Mediagoblin -- federated, autonomous media hosting +# Copyright (C) 2011 Free Software Foundation, Inc +# +# 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 sys @@ -21,7 +37,7 @@ setup( license = 'AGPLv3', author = 'Christopher Webber', - author_email = 'cwebber@dustycloud.org', + author_email = 'cwebber@gnu.org', entry_points = """\ [paste.app_factory] app = mediagoblin.app:paste_app_factory -- cgit v1.2.3 From 6755f50e8e073c651bf9f26824068396bc216405 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 2 Apr 2011 10:29:54 -0500 Subject: Basic authentication tools using py-bcrypt --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1f9f852d..5f386eef 100644 --- a/setup.py +++ b/setup.py @@ -33,6 +33,7 @@ setup( 'mongokit', 'webob', 'wtforms', + 'py-bcrypt', ], license = 'AGPLv3', -- cgit v1.2.3 From 4b5f4e8791064a154963a28e2614a2ce95eafc12 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 2 Apr 2011 10:48:34 -0500 Subject: Unit tests for our bcrypt auth stuff. Our first tests! --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 5f386eef..f38b2b60 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,9 @@ setup( 'webob', 'wtforms', 'py-bcrypt', + 'nose', ], + test_suite='nose.collector', license = 'AGPLv3', author = 'Christopher Webber', -- cgit v1.2.3 From 9578fe504795fef05f9bfaa802a3d7ee0fa1d440 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 9 Apr 2011 08:11:43 -0500 Subject: Include werkzeug. We'll need it for werkzeug.util.secure_filename at least. --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f38b2b60..8be416b1 100644 --- a/setup.py +++ b/setup.py @@ -35,6 +35,7 @@ setup( 'wtforms', 'py-bcrypt', 'nose', + 'werkzeug', ], test_suite='nose.collector', -- cgit v1.2.3 From 8e1e744d27fbc887c6d9ce6e937848a25275ed6c Mon Sep 17 00:00:00 2001 From: Will Kahn-Greene Date: Wed, 13 Apr 2011 10:04:30 -0400 Subject: Changes Mediagoblin -> MediaGoblin. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 8be416b1..1d790779 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -# GNU Mediagoblin -- federated, autonomous media hosting +# GNU MediaGoblin -- federated, autonomous media hosting # Copyright (C) 2011 Free Software Foundation, Inc # # This program is free software: you can redistribute it and/or modify -- cgit v1.2.3 From df0953ce453cd82989537df598613db2c0d3b055 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 17 Apr 2011 13:44:10 -0500 Subject: Buildout script which creates user_dev directory and necessary subdirectories for the user. --- setup.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1d790779..b47be4c3 100644 --- a/setup.py +++ b/setup.py @@ -45,5 +45,8 @@ setup( entry_points = """\ [paste.app_factory] app = mediagoblin.app:paste_app_factory + + [zc.buildout] + make_user_dev_dirs = mediagoblin.buildout_recipes:MakeUserDevDirs """, ) -- cgit v1.2.3 From 6bcab715b86dabe20aef7ba07960d50e4913ee15 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 24 Apr 2011 10:04:53 -0500 Subject: Time to require celery! --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b47be4c3..38f1a4d4 100644 --- a/setup.py +++ b/setup.py @@ -36,6 +36,7 @@ setup( 'py-bcrypt', 'nose', 'werkzeug', + 'celery', ], test_suite='nose.collector', -- cgit v1.2.3 From 132a68b54696c6a405cd9061bfe1dbe4feafb795 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 1 May 2011 18:22:27 -0500 Subject: Require sphinx & jinja2 for good measure :) --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 38f1a4d4..5f3ebf95 100644 --- a/setup.py +++ b/setup.py @@ -37,6 +37,8 @@ setup( 'nose', 'werkzeug', 'celery', + 'jinja2', + 'sphinx', ], test_suite='nose.collector', -- cgit v1.2.3 From 883cf4973464ec19b8360d699584294446a13559 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 3 May 2011 21:45:24 -0500 Subject: Require PIL --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 5f3ebf95..853a5a3b 100644 --- a/setup.py +++ b/setup.py @@ -39,6 +39,7 @@ setup( 'celery', 'jinja2', 'sphinx', + 'PIL', ], test_suite='nose.collector', -- cgit v1.2.3 From a5b06bb0750afd9d2751f92230d4dcb5c76d61c5 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 7 May 2011 22:45:30 -0500 Subject: Removing unused sys import from setup.py --- setup.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 853a5a3b..7b483a57 100644 --- a/setup.py +++ b/setup.py @@ -16,8 +16,6 @@ from setuptools import setup, find_packages -import sys - setup( name = "mediagoblin", version = "0.0.1", -- cgit v1.2.3 From 84d4f04edc468ba24685158fe379d37acb0db538 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 12 May 2011 09:44:04 -0500 Subject: Added extraction stuff that's not used but appears to work :) --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7b483a57..7d38e526 100644 --- a/setup.py +++ b/setup.py @@ -38,6 +38,7 @@ setup( 'jinja2', 'sphinx', 'PIL', + 'Babel', ], test_suite='nose.collector', @@ -50,5 +51,8 @@ setup( [zc.buildout] make_user_dev_dirs = mediagoblin.buildout_recipes:MakeUserDevDirs + + [babel.extractors] + jinja2 = jinja2.ext:babel_extract """, ) -- cgit v1.2.3 From 0546833c6ea4dcaaa82861819916760dd62d8fa7 Mon Sep 17 00:00:00 2001 From: Aaron Williamson Date: Fri, 13 May 2011 12:18:52 -0400 Subject: Generate unique slugs for newly submitted images. --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7d38e526..08887dee 100644 --- a/setup.py +++ b/setup.py @@ -39,6 +39,7 @@ setup( 'sphinx', 'PIL', 'Babel', + 'translitcodec', ], test_suite='nose.collector', -- cgit v1.2.3 From 029cad45c6fb61ac96b7601288a76523f98a247e Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 15 May 2011 19:02:11 -0500 Subject: ./bin/gmg shell! Should make a lot of peoples' hacking lives easier I suspect :) --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 08887dee..752f1b57 100644 --- a/setup.py +++ b/setup.py @@ -40,6 +40,7 @@ setup( 'PIL', 'Babel', 'translitcodec', + 'argparse', ], test_suite='nose.collector', @@ -47,6 +48,9 @@ setup( author = 'Christopher Webber', author_email = 'cwebber@gnu.org', entry_points = """\ + [console_scripts] + gmg = mediagoblin.gmg_commands:main_cli + [paste.app_factory] app = mediagoblin.app:paste_app_factory -- cgit v1.2.3 From 4d4b49a84e2791da6b12ef580565251c379264b6 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 31 May 2011 19:54:26 -0500 Subject: 0.0.2 of GNU MediaGoblin! --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 752f1b57..097dd7f2 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ from setuptools import setup, find_packages setup( name = "mediagoblin", - version = "0.0.1", + version = "0.0.2", packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), zip_safe=False, # scripts and dependencies @@ -45,7 +45,7 @@ setup( test_suite='nose.collector', license = 'AGPLv3', - author = 'Christopher Webber', + author = 'Free Software Foundation and contributors', author_email = 'cwebber@gnu.org', entry_points = """\ [console_scripts] -- cgit v1.2.3 From c5678c1ab3deb3f7a2961225c35260d5bbd69604 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 4 Jun 2011 13:20:48 -0500 Subject: Proper webtest infrastructure... seems to be about right anyway :) --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 097dd7f2..46da7276 100644 --- a/setup.py +++ b/setup.py @@ -41,6 +41,7 @@ setup( 'Babel', 'translitcodec', 'argparse', + 'webtest', ], test_suite='nose.collector', -- cgit v1.2.3 From 44e2da2fe60a3b8765d0fef5a9ce0c3e5997dd01 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Sun, 12 Jun 2011 03:24:31 +0200 Subject: Added Markdown rendering for `media_entry` --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 46da7276..fb86d600 100644 --- a/setup.py +++ b/setup.py @@ -42,6 +42,7 @@ setup( 'translitcodec', 'argparse', 'webtest', + 'Markdown', ], test_suite='nose.collector', -- cgit v1.2.3 From f970e6e5df915081ca9c2951a4f8f0984aaec0e8 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 15 Jun 2011 21:14:00 -0500 Subject: Require ConfigObj --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 46da7276..37144b5b 100644 --- a/setup.py +++ b/setup.py @@ -42,6 +42,7 @@ setup( 'translitcodec', 'argparse', 'webtest', + 'ConfigObj', ], test_suite='nose.collector', -- cgit v1.2.3 From 5a994e37c2947d20e3aedfb78f9d6194dd59d506 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 17 Jun 2011 17:44:36 -0500 Subject: We require lxml. Updating setup.py to reflect that. --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 46da7276..ae5394eb 100644 --- a/setup.py +++ b/setup.py @@ -42,6 +42,7 @@ setup( 'translitcodec', 'argparse', 'webtest', + 'lxml', ], test_suite='nose.collector', -- cgit v1.2.3 From d45e39664a1e6b9f1448302d5c2c3e12a603ead4 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 19 Jun 2011 15:35:19 -0500 Subject: Re-commenting-out lxml from setup.py Clarifying that this is something to install from the package manager and not via python setuptools itself. --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1ca12426..cd0e7f0b 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,9 @@ setup( 'argparse', 'webtest', 'ConfigObj', - 'lxml', + ## For now we're expecting that users will install this from + ## their package managers. + # 'lxml', ], test_suite='nose.collector', -- cgit v1.2.3 From 132773ae083ee137d6667ccdfc858c7a6865be5a Mon Sep 17 00:00:00 2001 From: Will Kahn-Greene Date: Tue, 5 Jul 2011 09:26:45 -0400 Subject: Updates version to 0.0.3. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2a007f4e..799f00d8 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ from setuptools import setup, find_packages setup( name = "mediagoblin", - version = "0.0.2", + version = "0.0.3", packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), zip_safe=False, # scripts and dependencies -- cgit v1.2.3 From b7e57b1f76c5f2fba3527dfcd919f517d1c67cca Mon Sep 17 00:00:00 2001 From: Will Kahn-Greene Date: Mon, 1 Aug 2011 12:13:02 -0400 Subject: Adds additional metadata to setup.py * trove classifiers * long description * url and download_url * ... --- setup.py | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 799f00d8..400bd591 100644 --- a/setup.py +++ b/setup.py @@ -49,21 +49,32 @@ setup( # 'lxml', ], test_suite='nose.collector', - - license = 'AGPLv3', - author = 'Free Software Foundation and contributors', - author_email = 'cwebber@gnu.org', entry_points = """\ - [console_scripts] - gmg = mediagoblin.gmg_commands:main_cli + [console_scripts] + gmg = mediagoblin.gmg_commands:main_cli - [paste.app_factory] - app = mediagoblin.app:paste_app_factory + [paste.app_factory] + app = mediagoblin.app:paste_app_factory - [zc.buildout] - make_user_dev_dirs = mediagoblin.buildout_recipes:MakeUserDevDirs + [zc.buildout] + make_user_dev_dirs = mediagoblin.buildout_recipes:MakeUserDevDirs - [babel.extractors] - jinja2 = jinja2.ext:babel_extract - """, + [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('README').read(), + classifiers=[ + "Development Status :: 3 - Alpha", + "Environment :: Web Environment", + "License :: OSI Approved :: GNU Affero General Public License", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Topic :: Internet :: WWW/HTTP :: Dynamic Content" + ], ) -- cgit v1.2.3 From c7f0b6fab08a52cc5a6e242ad3df2e674cb68fb9 Mon Sep 17 00:00:00 2001 From: Will Kahn-Greene Date: Mon, 1 Aug 2011 12:17:03 -0400 Subject: Updating version to 0.0.4. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 400bd591..3508f5f0 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ from setuptools import setup, find_packages setup( name = "mediagoblin", - version = "0.0.3", + version = "0.0.4", packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), zip_safe=False, # scripts and dependencies -- cgit v1.2.3 From 851c51a354d1355683093cdb04d48fcaafc20c28 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Thu, 4 Aug 2011 01:32:34 +0200 Subject: Feature 477 - Support Cloud Files public storage * Added configuration options to mediagoblin.ini * process_media supports the python-cloudfiles almost-file-like objects by wrapping them in a contextlib.contextmanager-decorated func. * storage now has the CloudFilesStorage * New dependency added to setup.py; `python-cloudfiles` --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3508f5f0..6043ad41 100644 --- a/setup.py +++ b/setup.py @@ -44,6 +44,7 @@ setup( 'webtest', 'ConfigObj', 'Markdown', + 'python-cloudfiles', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', -- cgit v1.2.3 From fbeeacd7aee5646418849d2ef732fc76e6caa3c1 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 6 Aug 2011 22:00:49 -0500 Subject: Tools to extract translation from python files and templates - Added pybabel script to entry points - Added babel.ini, which we'll use to extract stuff --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 6043ad41..40715dd0 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,7 @@ setup( 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 -- cgit v1.2.3 From 72ae87af4a0d5a9e30db220b3ec832721b027769 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 21 Aug 2011 00:09:29 -0500 Subject: Slightly wrapping paste error middleware and turning it on Now we can show a nice "borked goblin" error :) --- setup.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 40715dd0..d6ef584b 100644 --- a/setup.py +++ b/setup.py @@ -58,6 +58,9 @@ setup( [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 -- cgit v1.2.3 From cf37fffc117cb2eec0f69a3cee2d916a9972c9a2 Mon Sep 17 00:00:00 2001 From: Will Kahn-Greene Date: Thu, 1 Sep 2011 19:35:31 -0400 Subject: Switches to Zooko's version method This centralizes the version number into a single place but makes it available in the code as well as in setup.py. Based on the recipe found at http://stackoverflow.com/questions/458550/standard-way-to-embed-version-into-python-package/7071358#7071358 --- setup.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d6ef584b..c09e535b 100644 --- a/setup.py +++ b/setup.py @@ -15,10 +15,26 @@ # 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 = "0.0.4", + version = get_version(), packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), zip_safe=False, # scripts and dependencies @@ -73,7 +89,7 @@ setup( author_email='cwebber@gnu.org', url="http://mediagoblin.org/", download_url="http://mediagoblin.org/download/", - long_description=open('README').read(), + long_description=open(READMEFILE).read(), classifiers=[ "Development Status :: 3 - Alpha", "Environment :: Web Environment", -- cgit v1.2.3 From 12a100e4d8bdda7bd2353403a7e08e3a94669498 Mon Sep 17 00:00:00 2001 From: Will Kahn-Greene Date: Thu, 1 Sep 2011 20:49:54 -0400 Subject: 508. Updates copyright/license information --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c09e535b..06626926 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ # GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011 Free Software Foundation, Inc +# Copyright (C) 2011 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 -- cgit v1.2.3 From 81291bbb896d04fee66b9482f479b3fc6e6e07f5 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Wed, 28 Sep 2011 21:00:33 +0200 Subject: Added arista to install requires --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 06626926..7417fb97 100644 --- a/setup.py +++ b/setup.py @@ -61,6 +61,7 @@ setup( 'ConfigObj', 'Markdown', 'python-cloudfiles', + 'arista', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', -- cgit v1.2.3 From 243c3843bd574129caa7663e25d1a843b2d2dd30 Mon Sep 17 00:00:00 2001 From: Nathan Yergler Date: Sat, 1 Oct 2011 15:10:02 -0700 Subject: Whitespace and formatting cleanup. * Removed trailing whitespace * Line length < 80 where possible * Honor conventions on number of blank lines * Honor conventions about spaces around :, = --- setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 06626926..11c8fe6c 100644 --- a/setup.py +++ b/setup.py @@ -29,16 +29,17 @@ def get_version(): if mo: return mo.group(1) else: - raise RuntimeError("Unable to find version string in %s." % VERSIONFILE) + raise RuntimeError("Unable to find version string in %s." % + VERSIONFILE) setup( - name = "mediagoblin", - version = get_version(), + name="mediagoblin", + version=get_version(), packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), zip_safe=False, # scripts and dependencies - install_requires = [ + install_requires=[ 'setuptools', 'PasteScript', 'beaker', @@ -66,7 +67,7 @@ setup( # 'lxml', ], test_suite='nose.collector', - entry_points = """\ + entry_points="""\ [console_scripts] gmg = mediagoblin.gmg_commands:main_cli pybabel = mediagoblin.babel.messages.frontend:main @@ -83,7 +84,6 @@ setup( [babel.extractors] jinja2 = jinja2.ext:babel_extract """, - license='AGPLv3', author='Free Software Foundation and contributors', author_email='cwebber@gnu.org', -- cgit v1.2.3 From 26729e0277f883d489157160ab6f0f3fd9d35b47 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Wed, 5 Oct 2011 22:58:42 +0200 Subject: Multimedia refractoring, and added video thumbnail support --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7417fb97..4ceb4674 100644 --- a/setup.py +++ b/setup.py @@ -66,6 +66,7 @@ setup( ## their package managers. # 'lxml', ], + requires=['gst'], test_suite='nose.collector', entry_points = """\ [console_scripts] -- cgit v1.2.3 From 363d774eea0018cc687a5f4b43c232ff3b08078a Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Fri, 14 Oct 2011 03:18:30 +0200 Subject: Removed arista dependency --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4ceb4674..ccd1f653 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,6 @@ setup( 'ConfigObj', 'Markdown', 'python-cloudfiles', - 'arista', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', -- cgit v1.2.3 From eb5bb3fc997da26a39d6d77888574b634f00db57 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 18 Oct 2011 17:50:24 -0500 Subject: Require an older version of WebOb as a stopgap fix for Issue #622 Hopefully they'll release a new version with my patch soon! --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 06626926..d522cd9f 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ setup( 'routes', 'pymongo', 'mongokit', - 'webob', + 'webob<=1.2a2', 'wtforms', 'py-bcrypt', 'nose', -- cgit v1.2.3 From 6cde0361c76618b1673b2c9800d35f19c63ace51 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Thu, 27 Oct 2011 12:14:53 +0200 Subject: Added pygtk to dependencies --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ccd1f653..605349f0 100644 --- a/setup.py +++ b/setup.py @@ -61,6 +61,7 @@ setup( 'ConfigObj', 'Markdown', 'python-cloudfiles', + 'pygtk', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', -- cgit v1.2.3 From a63b640f12896a873ebf96f9fe0ef62d0794bfe7 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Mon, 21 Nov 2011 00:06:59 +0100 Subject: Stashing changes --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 605349f0..ccd1f653 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,6 @@ setup( 'ConfigObj', 'Markdown', 'python-cloudfiles', - 'pygtk', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', -- cgit v1.2.3 From 1b7662012f4f0827d01cc8747ce710b3e4dc6b81 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 25 Nov 2011 12:33:34 -0600 Subject: Uncommenting requires=['gst'] till I figure out why Joar added it there :) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c3c2f86f..ec672dd2 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ setup( ## their package managers. # 'lxml', ], - requires=['gst'], + # requires=['gst'], test_suite='nose.collector', entry_points="""\ [console_scripts] -- cgit v1.2.3 From 38f102515a84c1da25a9dab56d2fe7731412f4f5 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 4 Dec 2011 23:58:58 -0600 Subject: Cloudfiles not actually a dependency, removing from setup.py If users want cloudfiles, they can always ./bin/easy_install it. --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ec672dd2..293f3f03 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,6 @@ setup( 'webtest', 'ConfigObj', 'Markdown', - 'python-cloudfiles', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', -- cgit v1.2.3 From d595374d180afef2f468e75b50331ea8e1e621ed Mon Sep 17 00:00:00 2001 From: Elrond Date: Thu, 26 Jan 2012 21:33:49 +0100 Subject: Packaging improvement by Clint Byrum from Debian/Ubuntu 1) MANIFEST.in missed a bunch of things, especially config_spec.ini. 2) You need to specify include_package_data=True in setup.py to actually activate MANIFEST.in it seems. Thanks go to Clint Byrum! --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 293f3f03..ca7d4ae2 100644 --- a/setup.py +++ b/setup.py @@ -38,6 +38,7 @@ setup( version=get_version(), packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), zip_safe=False, + include_package_data = True, # scripts and dependencies install_requires=[ 'setuptools', -- cgit v1.2.3 From da471f26f201e2e9912f6a51e05a299a8b139199 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 28 Jan 2012 11:13:03 -0600 Subject: We aren't using translitcodec anymore. Kill it! --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ca7d4ae2..4761f2b5 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,6 @@ setup( 'sphinx', 'PIL', 'Babel', - 'translitcodec', 'argparse', 'webtest', 'ConfigObj', -- cgit v1.2.3 From b4e877ae9712df7c095d6a9c068ee6f2c234a059 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 28 Jan 2012 11:31:26 -0600 Subject: We were using translitcodec and I didn't understand how it worked ;) My bad! --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4761f2b5..ca7d4ae2 100644 --- a/setup.py +++ b/setup.py @@ -57,6 +57,7 @@ setup( 'sphinx', 'PIL', 'Babel', + 'translitcodec', 'argparse', 'webtest', 'ConfigObj', -- cgit v1.2.3 From 7f4ebeed7677a229f539bd2eaa78f9783dfc1477 Mon Sep 17 00:00:00 2001 From: Will Kahn-Greene Date: Wed, 8 Feb 2012 10:46:33 -0500 Subject: Fix copyright statements; add LICENSE for EXIF.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ca7d4ae2..9dd8964a 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ # GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011 MediaGoblin contributors. See AUTHORS. +# 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 -- cgit v1.2.3 From 99812bbc4a76735824708b341ea283f09a1b423c Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 19 Feb 2012 15:30:38 -0600 Subject: We now require sqlalchemy and sqlalchemy-migrate --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9dd8964a..1c7caf96 100644 --- a/setup.py +++ b/setup.py @@ -62,6 +62,8 @@ setup( 'webtest', 'ConfigObj', 'Markdown', + 'sqlalchemy', + 'sqlalchemy-migrate', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', -- cgit v1.2.3 From b594eadfbf90f09f4b2a73b7f89fed2b05ba10f3 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 26 Feb 2012 13:24:49 -0600 Subject: kombu-sqlalchemy a requirement in order for kombu sqlalchemy transport to work --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1c7caf96..3e382e56 100644 --- a/setup.py +++ b/setup.py @@ -64,6 +64,7 @@ setup( 'Markdown', 'sqlalchemy', 'sqlalchemy-migrate', + 'kombu-sqlalchemy', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', -- cgit v1.2.3 From ec05785089144e6bf7e2dd9056774342cec1415b Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 21 Apr 2012 20:29:02 -0500 Subject: Remove kombu-sqlalchemy and use database string in modern kombu-proper format Previously we were using kombu-sqlalchemy the library for sqlalchemy support. Newer kombu has support for this internally, so we're using that. Requires changing a celery setting and also removing kombu-sqlalchemy from your path. I hope the process of removing kombu-sqlalchemy from one's path doesn't confuse too many people...! --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3e382e56..1c7caf96 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,6 @@ setup( 'Markdown', 'sqlalchemy', 'sqlalchemy-migrate', - 'kombu-sqlalchemy', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', -- cgit v1.2.3 From 9679ab6c1c101c074f39774b3dedbe0b9dc28e4e Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 29 Apr 2012 11:11:08 -0500 Subject: Removing mongo and mongokit as dependencies. --- setup.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1c7caf96..37f2e19f 100644 --- a/setup.py +++ b/setup.py @@ -45,8 +45,6 @@ setup( 'PasteScript', 'beaker', 'routes', - 'pymongo', - 'mongokit', 'webob<=1.2a2', 'wtforms', 'py-bcrypt', -- cgit v1.2.3 From 2a376ae77ff6dc6b5b6291e85f7fc6c6fda15b44 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 11 Jun 2012 07:30:42 -0500 Subject: Now require sqlalchemy >= 0.7.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 37f2e19f..5d74cfac 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ setup( 'webtest', 'ConfigObj', 'Markdown', - 'sqlalchemy', + 'sqlalchemy>=0.7.0', 'sqlalchemy-migrate', ## For now we're expecting that users will install this from ## their package managers. -- cgit v1.2.3 From f2e3a6a01c2a8c63064152fd92d58b4903222d18 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 1 Jul 2012 10:41:37 -0500 Subject: Explicitly state that we need a webob version >= 1.1 also. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 5d74cfac..1299b33c 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ setup( 'PasteScript', 'beaker', 'routes', - 'webob<=1.2a2', + 'webob<=1.2a2,>=1.1', 'wtforms', 'py-bcrypt', 'nose', -- cgit v1.2.3 From 33e902e3b39d9f4b25280ccd15300eaca624e778 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 26 Jul 2012 10:46:10 -0500 Subject: Removing PIL from the setup.py develop process. People should use package managers to install PIL. It's too much of a mess to install via python packaging. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1299b33c..f3bbe4cc 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,6 @@ setup( 'celery', 'jinja2', 'sphinx', - 'PIL', 'Babel', 'translitcodec', 'argparse', @@ -65,6 +64,7 @@ setup( ## For now we're expecting that users will install this from ## their package managers. # 'lxml', + # 'PIL', ], # requires=['gst'], test_suite='nose.collector', -- cgit v1.2.3 From 3031764d13348ce4a3f03a3ee0c7418bcfb27c90 Mon Sep 17 00:00:00 2001 From: Will Kahn-Greene Date: Mon, 6 Aug 2012 11:42:15 -0400 Subject: Add python language version classifiers --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f3bbe4cc..7b03ebd3 100644 --- a/setup.py +++ b/setup.py @@ -97,6 +97,8 @@ setup( "License :: OSI Approved :: GNU Affero General Public License", "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 From 27a68d2b1e620d4dbc607439b2857159eac8af70 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 20 Aug 2012 11:04:13 -0500 Subject: Setting celery and kombu at very specific versions so that doing a fresh install doesn't break We really ought to get mediagoblin working with the latest packages. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7b03ebd3..21c1179e 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,8 @@ setup( 'py-bcrypt', 'nose', 'werkzeug', - 'celery', + 'celery==2.5.3', + 'kombu==2.1.7', 'jinja2', 'sphinx', 'Babel', -- cgit v1.2.3 From 5b60ec41ee5d0f25d66190b2a0114a8e1b216f86 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Sat, 20 Oct 2012 12:09:23 +0200 Subject: Removed Routes dependency, added admin routes --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 21c1179e..99584369 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,6 @@ setup( 'setuptools', 'PasteScript', 'beaker', - 'routes', 'webob<=1.2a2,>=1.1', 'wtforms', 'py-bcrypt', -- cgit v1.2.3 From df7e06c40ca6346b7c782dab85b5075f2b646cf3 Mon Sep 17 00:00:00 2001 From: Elrond Date: Sat, 24 Nov 2012 00:15:41 +0100 Subject: Require werkzeug >= 0.7 We need it, really. For csrf.py's request.scheme. Thanks to Sebastian Spaeth! --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 99584369..e0f7af7e 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ setup( 'wtforms', 'py-bcrypt', 'nose', - 'werkzeug', + 'werkzeug>=0.7', 'celery==2.5.3', 'kombu==2.1.7', 'jinja2', -- cgit v1.2.3 From 1ac1f00ebe8a307411435daa941f0a640ed111c1 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Sun, 2 Dec 2012 14:27:20 +0100 Subject: Use pypi-compatible license signature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It complains about a non-compatible license string. so use the GNU AGPL v3+ string that is listed at http://pypi.python.org/pypi?%3Aaction=list_classifiers With this change, we are able to create a pypi mediagoblin package. Signed-off-by: Sebastian Spaeth --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e0f7af7e..e3e56bf2 100644 --- a/setup.py +++ b/setup.py @@ -94,7 +94,7 @@ setup( classifiers=[ "Development Status :: 3 - Alpha", "Environment :: Web Environment", - "License :: OSI Approved :: GNU Affero General Public License", + "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)", "Operating System :: OS Independent", "Programming Language :: Python", 'Programming Language :: Python :: 2.6', -- cgit v1.2.3 From 8d19cb2445e2aa1f53431da26d866bf9b5e25872 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Fri, 16 Nov 2012 11:32:35 +0100 Subject: Don't require webob as dependency It is pushing up the daisies. Also relnote the change. --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e3e56bf2..dc4bd5e6 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,6 @@ setup( 'setuptools', 'PasteScript', 'beaker', - 'webob<=1.2a2,>=1.1', 'wtforms', 'py-bcrypt', 'nose', -- cgit v1.2.3 From e535b9b36fb3b336e3a2c69608d3935d5033ace2 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 6 Jan 2013 21:41:08 -0600 Subject: Make translitcodec optional, and work nicely without it. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index dc4bd5e6..12284f26 100644 --- a/setup.py +++ b/setup.py @@ -53,13 +53,14 @@ setup( 'jinja2', 'sphinx', 'Babel', - 'translitcodec', 'argparse', 'webtest', 'ConfigObj', 'Markdown', 'sqlalchemy>=0.7.0', 'sqlalchemy-migrate', + ## This is optional! + # 'translitcodec', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', -- cgit v1.2.3 From 394a4a37f7f71a6182d47cf7e6fcdf4fcccddd5d Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 23 Jan 2013 16:47:30 -0600 Subject: require mock for the new uuid-mocking tests --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 12284f26..9c295dc4 100644 --- a/setup.py +++ b/setup.py @@ -59,6 +59,7 @@ setup( 'Markdown', 'sqlalchemy>=0.7.0', 'sqlalchemy-migrate', + 'mock', ## This is optional! # 'translitcodec', ## For now we're expecting that users will install this from -- cgit v1.2.3 From db9ab08a11b8261905a9f529006b2c1b1bb82c09 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 24 Mar 2013 13:22:31 -0500 Subject: Webtest2 breaks response.cookies stuff for some reason. I don't understand why but other people do! This is a terrible commit message and I am sorry for it. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9c295dc4..7264f249 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ setup( 'sphinx', 'Babel', 'argparse', - 'webtest', + 'webtest<2', 'ConfigObj', 'Markdown', 'sqlalchemy>=0.7.0', -- cgit v1.2.3 From c7424612d7c0447373dce8d69aa5af03aebe08dc Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Sun, 24 Mar 2013 14:44:41 -0400 Subject: Back sessions with It's Dangerous. This is a contribution to #668. --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9c295dc4..3593604e 100644 --- a/setup.py +++ b/setup.py @@ -60,6 +60,7 @@ setup( 'sqlalchemy>=0.7.0', 'sqlalchemy-migrate', 'mock', + 'itsdangerous', ## This is optional! # 'translitcodec', ## For now we're expecting that users will install this from -- cgit v1.2.3 From 9e1fa2396fa4d340e3bcf01116cd1e2b6e5dee51 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Sun, 24 Mar 2013 15:10:08 -0400 Subject: Remove beaker stuff from the code. This is all obsoleted by It's Dangerous. --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3593604e..1aebeb0f 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,6 @@ setup( install_requires=[ 'setuptools', 'PasteScript', - 'beaker', 'wtforms', 'py-bcrypt', 'nose', -- cgit v1.2.3 From c8196f2805495f388a5e29bde07db08aa3800926 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 3 Apr 2013 15:21:40 -0500 Subject: Use py.test --boxed for unit tests from now on! --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7264f249..7e80409e 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ setup( 'beaker', 'wtforms', 'py-bcrypt', - 'nose', + 'pytest', 'werkzeug>=0.7', 'celery==2.5.3', 'kombu==2.1.7', -- cgit v1.2.3 From 39a71c09d7fbc991d8045341facb2bef8c838b5b Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 3 Apr 2013 16:31:42 -0500 Subject: Also require pytest-xdist! --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7e80409e..4b983e3f 100644 --- a/setup.py +++ b/setup.py @@ -47,6 +47,7 @@ setup( 'wtforms', 'py-bcrypt', 'pytest', + 'pytest-xdist', 'werkzeug>=0.7', 'celery==2.5.3', 'kombu==2.1.7', -- cgit v1.2.3 From f1c3807db73adcc5eb817d693d160386f87bb15b Mon Sep 17 00:00:00 2001 From: Jessica T Date: Thu, 11 Apr 2013 22:37:48 +0100 Subject: Adds the timesince ability which fixes #394 --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index a98cd013..ce1e4102 100644 --- a/setup.py +++ b/setup.py @@ -61,6 +61,7 @@ setup( 'sqlalchemy-migrate', 'mock', 'itsdangerous', + 'pytz', ## This is optional! # 'translitcodec', ## For now we're expecting that users will install this from -- cgit v1.2.3 From bc92ff9d3cc1e4b4aadbd7728f52f2829178e699 Mon Sep 17 00:00:00 2001 From: Elrond Date: Thu, 18 Apr 2013 15:53:09 +0200 Subject: Start to use six for basestring. six allows us to smoothly get more forward compatible with py3. The idea is to change things over to use six, when/if we feel a need for it. --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ce1e4102..312de2f8 100644 --- a/setup.py +++ b/setup.py @@ -62,6 +62,7 @@ setup( 'mock', 'itsdangerous', 'pytz', + 'six', ## This is optional! # 'translitcodec', ## For now we're expecting that users will install this from -- cgit v1.2.3 From b75eb88fabdac4a9fdc863969ec9472110732607 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 24 May 2013 18:49:06 -0500 Subject: No more of this find_packages nonsense. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Explicitly declare mediagoblin as the only package. find_packages has caused messes in the past :) This commit sponsored by Pedro Ângelo. Thanks! --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 312de2f8..4ceac45b 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ # 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 +from setuptools import setup import os import re @@ -36,7 +36,7 @@ def get_version(): setup( name="mediagoblin", version=get_version(), - packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), + packages=['mediagoblin'], zip_safe=False, include_package_data = True, # scripts and dependencies -- cgit v1.2.3 From ee4687752f8d1eccee8d5dc4d1c1b88de3a81f9e Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 3 Jun 2013 13:29:04 -0500 Subject: Make sure that the pytest revision is at least at 2.3. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4ceac45b..f320e92c 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ setup( 'PasteScript', 'wtforms', 'py-bcrypt', - 'pytest', + 'pytest>=2.3', 'pytest-xdist', 'werkzeug>=0.7', 'celery==2.5.3', -- cgit v1.2.3