Skip to content
Browse files

Add Simplified BSD License.

  • Loading branch information...
1 parent ef6d08a commit de372df79b2a5099927e2ece05583a5c0f90364e @bboe bboe committed Oct 30, 2012
Showing with 25 additions and 36 deletions.
  1. +22 −0 LICENSE.txt
  2. +1 −1 MANIFEST.in
  3. +0 −35 deploy.sh
  4. +2 −0 setup.py
View
22 LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright (c) 2012, Bryce Boe
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
2 MANIFEST.in
@@ -1 +1 @@
-include *.md
+include *.md *.txt
View
35 deploy.sh
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-status=$(git status | head -n 1)
-if [[ "$status" != "# On branch master" ]]; then
- echo "Not on master branch. Goodbye"
- exit 1
-fi
-
-status=$(git status | tail -n -1)
-if [[ "$status" != "nothing to commit (working directory clean)" ]]; then
- echo "There are pending changes. Goodbye"
- exit 1
-fi
-
-version=$(python -c "import prawtools; print prawtools.__version__")
-
-read -p "Do you want to deploy $version? [y/n] " input
-case $input in
- [Yy]* ) ;;
- * ) echo "Goodbye"; exit 1;;
-esac
-
-python setup.py sdist upload -s
-if [ $? -ne 0 ]; then
- echo "Pushing distribution failed. Aborting."
- exit 1
-fi
-
-git tag -s "prawtools-$version" -m "prawtools-$version"
-if [ $? -ne 0 ]; then
- echo "Tagging version failed. Aborting."
- exit 1
-fi
-
-git push origin master --tags
View
2 setup.py
@@ -14,12 +14,14 @@
version=VERSION,
author='Bryce Boe',
author_email='bbzbryce@gmail.com',
+ license='Simplified BSD License',
url='https://github.com/praw-dev/prawtools',
description=('A collection of utilities that utilize the reddit API.'),
long_description=README,
keywords='reddit mod moderator subreddit statistics tools',
classifiers=['Environment :: Console',
'Intended Audience :: Developers',
+ 'License :: OSI Approved :: BSD License',
'Natural Language :: English',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',

0 comments on commit de372df

Please sign in to comment.
Something went wrong with that request. Please try again.