diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 2d10f7c..205bc9d 100644 --- 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 `_ 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``. diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst new file mode 100644 index 0000000..c4b63ec --- /dev/null +++ b/CONTRIBUTORS.rst @@ -0,0 +1,9 @@ +Contributors +============ + +In alphabetical order: + +- Christian Geier +- Clément Mondon +- Julian Mehne +- Markus Unterwaditzer diff --git a/LICENSE b/LICENSE index 8195411..6486b87 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/docs/conf.py b/docs/conf.py index 0a3d87d..a043b1b 100644 --- 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'), ] diff --git a/setup.py b/setup.py index b540452..322e905 100644 --- 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. ''' diff --git a/tests/__init__.py b/tests/__init__.py index e013bde..2857034 100644 --- 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. ''' diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py index 180c9b0..cbc5c1f 100644 --- 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 diff --git a/tests/storage/dav/__init__.py b/tests/storage/dav/__init__.py index 92cb33f..c2af08c 100644 --- 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. ''' diff --git a/tests/storage/dav/servers/__init__.py b/tests/storage/dav/servers/__init__.py index cc3f048..1837537 100644 --- 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. ''' diff --git a/tests/storage/dav/test_main.py b/tests/storage/dav/test_main.py index 3452f5d..bb1c8cd 100644 --- 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. ''' diff --git a/tests/storage/test_filesystem.py b/tests/storage/test_filesystem.py index 941e75f..5cf4497 100644 --- 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. ''' diff --git a/tests/storage/test_http.py b/tests/storage/test_http.py index 4d300f6..fdc1369 100644 --- 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. ''' diff --git a/tests/storage/test_memory.py b/tests/storage/test_memory.py index bca4bb6..d5ec586 100644 --- 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. ''' diff --git a/tests/storage/test_singlefile.py b/tests/storage/test_singlefile.py index 6213c18..23b8f00 100644 --- 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. ''' diff --git a/tests/test_cli.py b/tests/test_cli.py index d8b0f71..1ab496b 100644 --- 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 diff --git a/tests/test_sync.py b/tests/test_sync.py index eeaa022..41d0a03 100644 --- 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. ''' diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py index 23f731f..db5791c 100644 --- 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. ''' diff --git a/tests/utils/test_main.py b/tests/utils/test_main.py index cef05b0..4785ebf 100644 --- 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. ''' diff --git a/tests/utils/test_vobject.py b/tests/utils/test_vobject.py index 4cddd6a..ce559e3 100644 --- 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. ''' diff --git a/vdirsyncer/__init__.py b/vdirsyncer/__init__.py index 935f47c..3feb005 100644 --- 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' diff --git a/vdirsyncer/cli.py b/vdirsyncer/cli.py index c25ab54..1786cf0 100644 --- 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. ''' diff --git a/vdirsyncer/exceptions.py b/vdirsyncer/exceptions.py index af35c28..e3bf1a9 100644 --- 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. ''' diff --git a/vdirsyncer/log.py b/vdirsyncer/log.py index 987187b..86eb740 100644 --- 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 diff --git a/vdirsyncer/storage/__init__.py b/vdirsyncer/storage/__init__.py index 34cb364..e29d3a1 100644 --- 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. ''' diff --git a/vdirsyncer/storage/base.py b/vdirsyncer/storage/base.py index 1d71425..042aa0e 100644 --- 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. ''' diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py index 586c0dc..f4c2a6a 100644 --- 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 diff --git a/vdirsyncer/storage/filesystem.py b/vdirsyncer/storage/filesystem.py index 9d02de5..31bfa50 100644 --- 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. ''' diff --git a/vdirsyncer/storage/http.py b/vdirsyncer/storage/http.py index 5190ed3..4b5fe04 100644 --- 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. ''' diff --git a/vdirsyncer/storage/memory.py b/vdirsyncer/storage/memory.py index 358330e..38f0f4b 100644 --- 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. ''' diff --git a/vdirsyncer/storage/singlefile.py b/vdirsyncer/storage/singlefile.py index d1cc6c2..a960eda 100644 --- 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. ''' diff --git a/vdirsyncer/sync.py b/vdirsyncer/sync.py index 31d7fcf..ed65a96 100644 --- 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 diff --git a/vdirsyncer/utils/__init__.py b/vdirsyncer/utils/__init__.py index 597ef2d..46462e1 100644 --- 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. ''' diff --git a/vdirsyncer/utils/vobject.py b/vdirsyncer/utils/vobject.py index 0824804..e8fc88c 100644 --- 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