Skip to content
This repository has been archived by the owner on Jan 16, 2023. It is now read-only.

Commit

Permalink
change to MIT License
Browse files Browse the repository at this point in the history
  • Loading branch information
antonagestam committed Nov 2, 2016
1 parent b275918 commit 47303ea
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 8 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2013-2016 Anton Agestam

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 the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
12 changes: 5 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,16 @@ Discussion is open and welcome.
**Testing**

To run tests, setup a virtualenv and install tox with ``pip install tox`` then
run ``tox`` in the project directory. To only run tests for a certain environment
run e.g. ``tox -e py35-django110``.
run ``tox`` in the project directory. To only run tests for a certain
environment run e.g. ``tox -e py35-django110``.


License
-------

Collectfast is licensed under a `Creative Commons Attribution-ShareAlike
3.0 Unported License <http://creativecommons.org/licenses/by-sa/3.0/>`_.

Original idea taken from `this
snippet. <http://djangosnippets.org/snippets/2889/>`__
Collectfast is licensed under the MIT License, see LICENSE file for more
information. Previous versions of Collectfast was licensed under Creative
Commons Attribution-ShareAlike 3.0 Unported License.


.. |Build Status| image:: https://api.travis-ci.org/antonagestam/collectfast.svg?branch=master
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
setup(
name='Collectfast',
description='Collectstatic on Steroids',
version='0.3.0',
version='0.3.1',
long_description=open('README.rst').read(),
author='Anton Agestam',
author_email='msn@antonagestam.se',
Expand Down

0 comments on commit 47303ea

Please sign in to comment.