sync branch with master

Author: bear

.travis.yml

@@ -2,7 +2,6 @@ language: python
 sudo: false
 python:
   - "2.7"
-  - "3.5"
 
 before_install:
   - pip install codecov

Makefile

@@ -1,10 +1,10 @@
-.PHONY: docs test
 
 help:
 	@echo "  env         create a development environment using virtualenv"
 	@echo "  deps        install dependencies"
 	@echo "  clean       remove unwanted stuff"
 	@echo "  lint        check style with flake8"
+	@echo "  coverage    run tests with code coverage"
 	@echo "  test        run tests"
 
 env:
@@ -27,8 +27,15 @@ clean:
 lint:
 	flake8 twitter > violations.flake8.txt
 
+coverage:
+	nosetests --with-coverage --cover-package=twitter
+
 test:
-	python test.py
+	nosetests
+
+build: clean
+	python setup.py sdist
+	python setup.py bdist_wheel
 
 upload: clean
 	python setup.py sdist upload

README.rst

@@ -4,9 +4,21 @@ A Python wrapper around the Twitter API.
 
 By the `Python-Twitter Developers <python-twitter@googlegroups.com>`_
 
-.. image:: https://pypip.in/wheel/python-twitter/badge.png
-    :target: https://pypi.python.org/pypi/python-twitter/
-    :alt: Wheel Status
+.. image:: https://img.shields.io/pypi/v/python-twitter.svg
+    :target: https://pypi.python.org/pypi/parsedatetime/
+    :alt: Downloads
+
+.. image:: https://travis-ci.org/bear/python-twitter.svg?branch=master
+    :target: https://travis-ci.org/bear/python-twitter
+    :alt: Travis CI
+
+.. image:: http://codecov.io/github/bear/python-twitter/coverage.svg?branch=master
+    :target: http://codecov.io/github/bear/python-twitter
+    :alt: Codecov
+
+.. image:: https://requires.io/github/bear/python-twitter/requirements.svg?branch=master
+     :target: https://requires.io/github/bear/python-twitter/requirements/?branch=master
+     :alt: Requirements Status
 
 ============
 Introduction
@@ -24,10 +36,6 @@ You can install python-twitter using::
 
     $ pip install python-twitter
 
-Testing::
-
-    $ python test.py
-
 ================
 Getting the code
 ================
@@ -47,14 +55,18 @@ Activate the virtual environment created:
 
 	$ source env/bin/activate
 
-Run tests:
+=============
+Running Tests
+=============
+Note that tests require ```pip install nose``` and optionally ```pip install coverage```:
 
-	$ make test
+To run the unit tests:
 
-To see other options available, run:
+	$ make test
 
-	$ make help
+to also run code coverage:
 
+    $ make coverage
 
 =============
 Documentation

coveragerc

@@ -0,0 +1,2 @@
+[run]
+source = twitter

get_access_token.py

@@ -24,7 +24,7 @@
 
 
 def get_access_token(consumer_key, consumer_secret):
-    oauth_client = OAuth1Session(consumer_key, client_secret=consumer_secret)
+    oauth_client = OAuth1Session(consumer_key, client_secret=consumer_secret, callback_uri='oob')
 
     print 'Requesting temp token from Twitter'