heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-08-03 18:01:17 -05:00
commit e69bb23b4c
4 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README
View File

@ -33,6 +33,10 @@ hang out, see `our Join page <http://mediagoblin.org/join/>`_
Where is the documentation? Where is the documentation?
=========================== ===========================
Documentation is located in the ``docs/`` directory in a "raw" The beginnings of a user manual is located in the ``docs/`` directory
restructured-text form. It is also available at in HTML, Texinfo, and source (Restructured Text) forms. It's also
http://docs.mediagoblin.org/ in HTML form. available online at http://docs.mediagoblin.org/ in HTML form.
Contributor/developer documentation as well as documentation on the
project processes and infrastructure is located on
`the wiki <http://wiki.mediagoblin.org/>`_.

4
docs/source/conf.py
View File

@ -48,9 +48,9 @@ copyright = u'2011, Free Software Foundation, Inc and contributors'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '0.0.3' version = '0.0.4'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '0.0.3' release = '0.0.4'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

3
maketarball.sh
View File

@ -154,10 +154,13 @@ then
mv docs/build/texinfo/ docs/texinfo/ mv docs/build/texinfo/ docs/texinfo/
rm -rf docs/build/ rm -rf docs/build/
rm -rf docs/source/mgext/*.pyc
else else
# this is the old directory structure pre-0.0.4
mv docs/_build/html/ docs/html/ mv docs/_build/html/ docs/html/
rm -rf docs/_build/ rm -rf docs/_build/
rm -rf docs/mgext/*.pyc
fi fi
popd popd

39
setup.py
View File

@ -18,7 +18,7 @@ from setuptools import setup, find_packages
setup( setup(
name = "mediagoblin", name = "mediagoblin",
version = "0.0.3", version = "0.0.4",
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
zip_safe=False, zip_safe=False,
# scripts and dependencies # scripts and dependencies
@ -49,21 +49,32 @@ setup(
# 'lxml', # 'lxml',
], ],
test_suite='nose.collector', test_suite='nose.collector',
license = 'AGPLv3',
author = 'Free Software Foundation and contributors',
author_email = 'cwebber@gnu.org',
entry_points = """\ entry_points = """\
[console_scripts] [console_scripts]
gmg = mediagoblin.gmg_commands:main_cli gmg = mediagoblin.gmg_commands:main_cli
[paste.app_factory] [paste.app_factory]
app = mediagoblin.app:paste_app_factory app = mediagoblin.app:paste_app_factory
[zc.buildout] [zc.buildout]
make_user_dev_dirs = mediagoblin.buildout_recipes:MakeUserDevDirs make_user_dev_dirs = mediagoblin.buildout_recipes:MakeUserDevDirs
[babel.extractors] [babel.extractors]
jinja2 = jinja2.ext:babel_extract 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"
],
) )