jan/debianmemberportfolio
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Merge tag '0.3' into develop

Browse source 
Release 0.3

- switch to Debian Wheezy dependencies
This commit is contained in:
Jan Dittberner 2014-01-11 17:21:05 +01:00
commit 13485cdb26
2 changed files with 40 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

40
docs/source/conf.py
View file

@ -1,12 +1,14 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Debian Developer Portfolio Service documentation build configuration file, created by # Debian Member Portfolio Service documentation build configuration file,
# sphinx-quickstart on Tue Jan 20 22:27:21 2009. # created by sphinx-quickstart on Tue Jan 20 22:27:21 2009.
# #
# This file is execfile()d with the current directory set to its containing dir. # This file is execfile()d with the current directory set to its containing
# dir.
# #
# The contents of this file are pickled, so don't put values in the namespace # The contents of this file are pickled, so don't put values in the namespace
# that aren't pickleable (module imports are okay, they're removed automatically). # that aren't pickleable (module imports are okay, they're removed
# automatically).
# #
# Note that not all possible configuration values are present in this # Note that not all possible configuration values are present in this
# autogenerated file. # autogenerated file.
@ -14,7 +16,8 @@
# All configuration values have a default; values that are commented out # All configuration values have a default; values that are commented out
# serve to show the default. # serve to show the default.
import sys, os import sys
import os
# If your extensions are in another directory, add it here. If the directory # If your extensions are in another directory, add it here. If the directory
# is relative to the documentation root, use os.path.abspath to make it # is relative to the documentation root, use os.path.abspath to make it
@ -25,8 +28,8 @@ sys.path.append(
# General configuration # General configuration
# --------------------- # ---------------------
# Add any Sphinx extension module names here, as strings. They can be extensions # Add any Sphinx extension module names here, as strings. They can be
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode'] extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
# Add any paths that contain templates here, relative to this directory. # Add any paths that contain templates here, relative to this directory.
@ -42,17 +45,17 @@ source_suffix = '.rst'
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
project = u'Debian Developer Portfolio Service' project = u'Debian Member Portfolio Service'
copyright = u'2009-2013, Jan Dittberner' copyright = u'2009-2014, Jan Dittberner'
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '0.2.20' version = '0.3'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '0.2.20' release = '0.3'
# 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.
@ -71,7 +74,8 @@ language = 'en'
# for source files. # for source files.
exclude_trees = [] exclude_trees = []
# The reST default role (used for this markup: `text`) to use for all documents. # The reST default role (used for this markup: `text`) to use for all
# documents.
#default_role = None #default_role = None
# If true, '()' will be appended to :func: etc. cross-reference text. # If true, '()' will be appended to :func: etc. cross-reference text.
@ -154,7 +158,7 @@ html_use_modindex = False
#html_file_suffix = '' #html_file_suffix = ''
# Output file base name for HTML help builder. # Output file base name for HTML help builder.
htmlhelp_basename = 'DebianDeveloperPortfolioServicedoc' htmlhelp_basename = 'DebianMemberPortfolioServicedoc'
# Options for LaTeX output # Options for LaTeX output
@ -167,10 +171,14 @@ htmlhelp_basename = 'DebianDeveloperPortfolioServicedoc'
#latex_font_size = '10pt' #latex_font_size = '10pt'
# Grouping the document tree into LaTeX files. List of tuples # Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, document class [howto/manual]). # (source start file, target name, title, author, document class
# [howto/manual]).
latex_documents = [ latex_documents = [
('index', 'DebianDeveloperPortfolioService.tex', ur'Debian Developer Portfolio Service Documentation', ('index',
ur'Jan Dittberner', 'manual'), 'DebianMemberPortfolioService.tex',
ur'Debian Member Portfolio Service Documentation',
ur'Jan Dittberner',
'manual'),
] ]
# The name of an image file (relative to this directory) to place at the top of # The name of an image file (relative to this directory) to place at the top of

33
setup.py
View file

@ -1,24 +1,23 @@
# -*- python -*- # -*- python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# DDPortfolio service setup # Debian Member Portfolio service setup
# Copyright © 2009, 2010, 2011, 2012, 2013 Jan Dittberner <jan@dittberner.info> # Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
# #
# This file is part of DDPortfolio service. # This file is part of the Debian Member Portfolio service.
# #
# DDPortfolio service is free software: you can redistribute it and/or # Debian Member Portfolio service is free software: you can redistribute it
# modify it under the terms of the GNU Affero General Public License # and/or modify it under the terms of the GNU Affero General Public License as
# as published by the Free Software Foundation, either version 3 of # published by the Free Software Foundation, either version 3 of the License,
# the License, or (at your option) any later version. # or (at your option) any later version.
# #
# DDPortfolio service is distributed in the hope that it will be # Debian Member Portfolio service is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied warranty # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
# Affero General Public License for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public # You should have received a copy of the GNU Affero General Public
# License along with this program. If not, see # License along with this program. If not, see <http://www.gnu.org/licenses/>.
# <http://www.gnu.org/licenses/>.
# #
try: try:
from setuptools import setup, find_packages from setuptools import setup, find_packages
@ -29,11 +28,11 @@ except ImportError:
setup( setup(
name='ddportfolioservice', name='ddportfolioservice',
version='0.2.20', version='0.3',
description='service to create DDPortfolio URLs', description='service to create Debian Member Portfolio URLs',
long_description="""This is a service implementation that long_description="""This is a service implementation that
returns a set of personalized URLs as outlined in returns a set of personalized URLs as outlined in
http://wiki.debian.org/DDPortfolio. It takes the Debian developers http://wiki.debian.org/DDPortfolio. It takes the Debian Member's
full name and email address as input and returns a JSON formatted full name and email address as input and returns a JSON formatted
array of URLs.""", array of URLs.""",
# Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
@ -53,7 +52,7 @@ array of URLs.""",
include_package_data=True, include_package_data=True,
test_suite='nose.collector', test_suite='nose.collector',
package_data={'ddportfolioservice': ['*.ini', 'i18n/*/LC_MESSAGES/*.mo']}, package_data={'ddportfolioservice': ['*.ini', 'i18n/*/LC_MESSAGES/*.mo']},
message_extractors = {'ddportfolioservice': [ message_extractors={'ddportfolioservice': [
('**.py', 'python', None), ('**.py', 'python', None),
('templates/**.mako', 'mako', None), ('templates/**.mako', 'mako', None),
('public/**', 'ignore', None)]}, ('public/**', 'ignore', None)]},