Copyright and contributor stuff

Fix #60
2026-03-25 08:55:50 +00:00 · 2014-05-22 12:50:14 +02:00 · 2014-05-22 12:50:14 +02:00 · c1eb55c241
commit c1eb55c241
parent 3e4f5ba995
33 changed files with 54 additions and 33 deletions
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@ -13,3 +13,15 @@
  that syncronizes all the data. If you're looking for a viewer for the
  calendar data you've synced, `khal <https://github.com/geier/khal>`_ is what
  you're looking for.
+
+* If you're submitting pull requests:
+
+  * Make sure your tests pass on Travis.
+
+  * But not because you wrote too few tests.
+
+  * Write descriptive commit messages, mostly because i need to write a
+    changelog at some point. Use ``git rebase -i`` and ``git commit --ammend``
+    if needed.
+  
+  * Add yourself to ``CONTRIBUTORS.rst``.
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@ -0,0 +1,9 @@
+Contributors
+============
+
+In alphabetical order:
+
+- Christian Geier
+- Clément Mondon
+- Julian Mehne
+- Markus Unterwaditzer
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-Copyright (c) 2013 Markus Unterwaditzer
+Copyright (c) 2014 Markus Unterwaditzer & contributors

 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
--- a/docs/conf.py
+++ b/docs/conf.py
@ -9,7 +9,7 @@ source_suffix = '.rst'
 master_doc = 'index'

 project = u'vdirsyncer'
-copyright = u'2014, Markus Unterwaditzer'
+copyright = u'2014, Markus Unterwaditzer & contributors'

 import pkg_resources
 try:
@ -46,6 +46,6 @@ man_pages = [

 texinfo_documents = [
    ('index', 'vdirsyncer', u'vdirsyncer Documentation',
-     u'Markus Unterwaditzer', 'vdirsyncer', 'One line description of project.',
-     'Miscellaneous'),
+     u'Markus Unterwaditzer', 'vdirsyncer',
+     'One line description of project.', 'Miscellaneous'),
 ]
--- a/setup.py
+++ b/setup.py
@ -6,7 +6,7 @@
    vdirsyncer is a syncronization tool for vdir. See the README for more
    details.

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/tests/init.py
+++ b/tests/init.py
@ -5,7 +5,7 @@

    Test suite for vdirsyncer.

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/tests/storage/init.py
+++ b/tests/storage/init.py
@ -3,7 +3,7 @@
    tests.storage
    ~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''
 import random
--- a/tests/storage/dav/init.py
+++ b/tests/storage/dav/init.py
@ -3,6 +3,6 @@
    tests.storage.dav
    ~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''
--- a/tests/storage/dav/servers/init.py
+++ b/tests/storage/dav/servers/init.py
@ -3,6 +3,6 @@
    tests.storage.dav.servers
    ~~~~~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''
--- a/tests/storage/dav/test_main.py
+++ b/tests/storage/dav/test_main.py
@ -3,7 +3,7 @@
    tests.storage.dav.test_main
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/tests/storage/test_filesystem.py
+++ b/tests/storage/test_filesystem.py
@ -4,7 +4,7 @@
    tests.storage.filesystem
    ~~~~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/tests/storage/test_http.py
+++ b/tests/storage/test_http.py
@ -3,7 +3,7 @@
    tests.storage.test_http
    ~~~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/tests/storage/test_memory.py
+++ b/tests/storage/test_memory.py
@ -4,7 +4,7 @@
    tests.storage.test_memory
    ~~~~~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/tests/storage/test_singlefile.py
+++ b/tests/storage/test_singlefile.py
@ -3,7 +3,7 @@
    tests.storage.test_singlefile
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@ -3,7 +3,7 @@
    tests.test_cli
    ~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''
 from textwrap import dedent
--- a/tests/test_sync.py
+++ b/tests/test_sync.py
@ -3,7 +3,7 @@
    tests.test_sync
    ~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/tests/utils/init.py
+++ b/tests/utils/init.py
@ -3,6 +3,6 @@
    tests.utils
    ~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''
--- a/tests/utils/test_main.py
+++ b/tests/utils/test_main.py
@ -3,7 +3,7 @@
    tests.utils.test_main
    ~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/tests/utils/test_vobject.py
+++ b/tests/utils/test_vobject.py
@ -3,7 +3,7 @@
    tests.utils.vobject
    ~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/vdirsyncer/init.py
+++ b/vdirsyncer/init.py
@ -6,7 +6,7 @@
    vdirsyncer is a syncronization tool for vdir. See the README for more
    details.

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''
 __version__ = '0.1.5'
--- a/vdirsyncer/cli.py
+++ b/vdirsyncer/cli.py
@ -3,7 +3,7 @@
    vdirsyncer.cli
    ~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/vdirsyncer/exceptions.py
+++ b/vdirsyncer/exceptions.py
@ -6,7 +6,7 @@
    Contains exception classes used by vdirsyncer. Not all exceptions are here,
    only the most commonly used ones.

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/vdirsyncer/log.py
+++ b/vdirsyncer/log.py
@ -3,7 +3,7 @@
    vdirsyncer.log
    ~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''
 import logging
--- a/vdirsyncer/storage/init.py
+++ b/vdirsyncer/storage/init.py
@ -8,7 +8,7 @@
    interface is described in `vdirsyncer.storage.base`, the `Storage` class
    should be a superclass of all storage classes.

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/vdirsyncer/storage/base.py
+++ b/vdirsyncer/storage/base.py
@ -3,7 +3,7 @@
    vdirsyncer.storage.base
    ~~~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/vdirsyncer/storage/dav.py
+++ b/vdirsyncer/storage/dav.py
@ -3,7 +3,7 @@
    vdirsyncer.storage.dav
    ~~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer, Christian Geier and contributors
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''
 import datetime
--- a/vdirsyncer/storage/filesystem.py
+++ b/vdirsyncer/storage/filesystem.py
@ -3,7 +3,7 @@
    vdirsyncer.storage.filesystem
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/vdirsyncer/storage/http.py
+++ b/vdirsyncer/storage/http.py
@ -3,7 +3,7 @@
    vdirsyncer.storage.http
    ~~~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/vdirsyncer/storage/memory.py
+++ b/vdirsyncer/storage/memory.py
@ -3,7 +3,7 @@
    vdirsyncer.storage.memory
    ~~~~~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/vdirsyncer/storage/singlefile.py
+++ b/vdirsyncer/storage/singlefile.py
@ -3,7 +3,7 @@
    vdirsyncer.storage.singlefile
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/vdirsyncer/sync.py
+++ b/vdirsyncer/sync.py
@ -12,7 +12,7 @@
    The algorithm is based on the blogpost "How OfflineIMAP works" by Edward Z.
    Yang. http://blog.ezyang.com/2012/08/how-offlineimap-works/

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''
 import itertools
--- a/vdirsyncer/utils/init.py
+++ b/vdirsyncer/utils/init.py
@ -3,7 +3,7 @@
    vdirsyncer.utils
    ~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''

--- a/vdirsyncer/utils/vobject.py
+++ b/vdirsyncer/utils/vobject.py
@ -3,7 +3,7 @@
    vdirsyncer.utils.vobject
    ~~~~~~~~~~~~~~~~~~~~~~~~

-    :copyright: (c) 2014 Markus Unterwaditzer
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
    :license: MIT, see LICENSE for more details.
 '''
 import hashlib