Merge pull request #30 from MPDL-Innovations/master

Preparation for 1.2.0 release

docs/conf.py

@@ -47,16 +47,16 @@
 
 # General information about the project.
 project = u'pyimeji'
-copyright = u'2014, Robert Forkel'
+copyright = u'2014, Robert Forkel & Max Planck Digital Library (MPDL)'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.1'
+version = '1.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.1'
+release = '1.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -219,7 +219,7 @@
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
   ('index', 'pyimeji.tex', u'pyimeji Documentation',
-   u'Robert Forkel', 'manual'),
+   u'Robert Forkel & Max Planck Digital Library (MPDL)', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -249,7 +249,7 @@
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'pyimeji', u'pyimeji Documentation',
-     [u'Robert Forkel'], 1)
+     [u'Robert Forkel & Max Planck Digital Library (MPDL)'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -263,7 +263,7 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
   ('index', 'pyimeji', u'pyimeji Documentation',
-   u'Robert Forkel', 'pyimeji', 'One line description of project.',
+   u'Robert Forkel & Max Planck Digital Library (MPDL)', 'pyimeji', 'One line description of project.',
    'Miscellaneous'),
 ]
 

docs/tutorial.rst

@@ -56,12 +56,13 @@ In the following we use pyimeji to curate a data collection on an imeji instance
 
 .. code-block:: python
 
-    >>> from pyimeji.api import Imeji
-    >>> api = Imeji()
-    >>> collection = api.create('collection', title='hello world!')
+     >>> from pyimeji.api import Imeji
+     >>> api = Imeji()
+     >>> collection = api.create('collection', title='hello world!')
 
- 1.1. Creating a collection with the default metadata profile referenced
- .. code-block:: python
+1.1. Creating a collection with the default metadata profile referenced
+
+.. code-block:: python
 
     >>> from pyimeji.api import Imeji
     >>> api = Imeji()

pyimeji/__init__.py

@@ -1 +1 @@
-__version__ = "1.1.1"
+__version__ = "1.2.0"

setup.py

@@ -21,18 +21,18 @@ def read(fname):
 
 setup(
     name='pyimeji',
-    version="1.1.1",
+    version="1.2.0",
     description='A python wrapper for the imeji API',
     long_description=read("README.rst"),
-    author='Robert Forkel',
-    author_email='[email protected]',
+    author='Robert Forkel & Max Planck Digital Library (MPDL)',
+    author_email='[email protected]',
     url='https://github.com/imeji-community/pyimeji',
     install_requires=requires,
     license=read("LICENSE"),
     zip_safe=False,
     keywords='imeji',
     classifiers=[
-        'Development Status :: 2 - Pre-Alpha',
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',