Merge branch 'release/0.0.8'

.scrutinizer.yml

@@ -0,0 +1,3 @@
+filter:
+  paths:
+    - srt.py

.travis.yml

@@ -1,16 +1,24 @@
 language: python
-install:
-  - pip install -r docs/requirements.txt
-  - pip install -r tests/requirements.txt
-python:
-  - 2.7
-  - 3.3
-  - 3.4
-script:
-  - nosetests --with-coverage
+python: 3.5  # 3.5 requires manual download, so it needs to be selected
 
-  # doctest is not tested on Python 2 because Python 2/3 have differing
-  # invocations in some doctests, and we are mainly targeting Python 3.
-  - '[[ $(python --version 2>&1) == "Python 2"* ]] || (cd docs && make doctest)'
-after_success:
-  - coveralls
+env:
+  - TOXENV=py27
+  - TOXENV=py33
+  - TOXENV=py34
+  - TOXENV=py35
+  - TOXENV=coverage
+
+install: pip install tox
+script: tox
+
+matrix:
+  fast_finish: true
+
+# This is required to enable container based Travis CI infrastructure.
+# See http://docs.travis-ci.com/user/migrating-from-legacy/
+sudo: false
+
+notifications:
+  email:
+    on_success: never
+    on_failure: always

LICENSE

@@ -1,13 +1,5 @@
-© 2014-2015 Christopher Down
+This is free and unencumbered software released into the public domain.
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.

README.rst

@@ -1,53 +1,48 @@
-===
-srt
-===
+srt is a tiny Python library for parsing, modifying, and composing `SRT
+files`_. Take a look at the quickstart_ for a basic overview of the library.
+`Detailed API documentation`_ is also available.
 
-.. image:: https://img.shields.io/travis/cdown/srt/develop.svg?label=linux
-        :target: https://travis-ci.org/cdown/srt
-
-.. image:: https://img.shields.io/appveyor/ci/cdown/srt/develop.svg?label=windows
-        :target: https://ci.appveyor.com/project/cdown/srt
-
-.. image:: https://img.shields.io/coveralls/cdown/srt/develop.svg
-        :target: https://coveralls.io/r/cdown/srt
-
-.. image:: https://landscape.io/github/cdown/srt/develop/landscape.svg
-        :target: https://landscape.io/github/cdown/srt/develop
-
-.. image:: https://img.shields.io/requires/github/cdown/srt.svg?label=deps
-        :target: https://requires.io/github/cdown/srt/requirements/?branch=develop
-
-srt is a tiny Python library for parsing, modifying, and composing SRT files.
-
-Documentation
--------------
-
-If you're new to the library, take a look at the quickstart_ for ideas about
-how to use it. `Detailed API documentation`_ is also available.
+Want to see some real-world examples? Take a look at the srt-tools_ repo.
 
 .. _quickstart: http://srt.readthedocs.org/en/latest/quickstart.html
 .. _`Detailed API documentation`: http://srt.readthedocs.org/en/latest/api.html
+.. _srt-tools: https://github.com/cdown/srt-tools
+.. _`SRT files`: https://en.wikipedia.org/wiki/SubRip#SubRip_text_file_format
 
 Installation
 ------------
 
-From pip:
+To install the latest stable version from PyPi:
 
 .. code::
 
+    pip install -U srt
 
-    pip install srt
-
-Manually:
+To install the latest development version directly from GitHub:
 
 .. code::
 
-    python setup.py install
-
+    pip install -U git+https://github.com/cdown/srt.git@develop
 
 Testing
 -------
 
+|travis| |coveralls| |scrutinizer|
+
+.. |travis| image:: https://travis-ci.org/cdown/srt.svg?branch=develop
+  :target: https://travis-ci.org/cdown/srt
+  :alt: Test status
+
+.. |coveralls| image:: https://coveralls.io/repos/cdown/srt/badge.svg?branch=develop&service=github
+  :target: https://coveralls.io/github/cdown/srt?branch=develop
+  :alt: Coverage
+
+.. |scrutinizer| image:: https://img.shields.io/scrutinizer/g/cdown/srt/develop.svg
+  :target: https://scrutinizer-ci.com/g/cdown/srt/?branch=develop
+  :alt: Code quality
+
 .. code::
 
-    python setup.py test
+   tox -e quick
+
+.. _Tox: https://tox.readthedocs.org