Fixes based on feedback from @dpoirier

Author: Rebecca

README.rst

@@ -33,7 +33,7 @@ Requirements
 django-timepiece is compatible with Django 1.6 (on Python 2.7 and Python 3.3),
 and Django 1.7 (on Python 2.7 and Python 3.4). PostgreSQL is the only
 officially supported backend. For a full list of required libraries, see
-the `requirements`_.
+the `requirements/base.txt` from the project source on `GitHub`_.
 
 We actively support desktop versions of Chrome and Firefox, as well as common
 mobile platforms. We do not support most versions of Internet Explorer. We
@@ -44,19 +44,31 @@ Documentation
 
 Documentation is hosted on `Read The Docs`_.
 
-To build the documentation locally, install the `documentation requirements`_.
-A makefile is included with the documentation so you can run `make html` in
-the `doc/` directory to build docs as HTML.
+To build the documentation locally:
+
+#. Download a copy of the `django-timepiece` source, either through
+   use of `git clone` or by downloading a zipfile from `GitHub`_.
+
+#. Make sure that the top-level directory is on your Python path. If you're
+   using a virtual environment, this can be accomplished via::
+
+        cd /path/to/django-timepiece/ && add2virtualenv .
+
+#. Install the requirements in `requirements/docs.txt` from the project
+   source on `GitHub`_.
+
+#. Run ``make html`` from within the `docs/` directory. HTML files will be
+   output in the `docs/_build/html/` directory.
 
 Installation
 ------------
 
 #. django-timepiece is available on `PyPI`_, so the easiest way to
-   install it and its dependencies is to use `pip <http://pip.openplans.org/>`_::
+   install it and its dependencies is to use `pip`_::
 
     $ pip install django-timepiece
 
-#. Ensure that `less <http://lesscss.org>`_ is installed on your machine::
+#. Ensure that `less`_ is installed on your machine::
 
     # Install node.js and npm:
     $ sudo apt-get install python-software-properties
@@ -172,10 +184,12 @@ Installation
         ...
     )
 
-Development sponsored by `Caktus Consulting Group, LLC
-<http://www.caktusgroup.com/services>`_.
+Development sponsored by `Caktus Group`_.
+
 
+.. _Caktus Group: https://www.caktusgroup.com/services
+.. _GitHub: https://github.com/caktus/django-timepiece
+.. _less: http://lesscss.org
+.. _pip: http://pip.openplans.org/
 .. _PyPI: http://pypi.python.org/pypi/django-timepiece
 .. _Read The Docs: http://django-timepiece.readthedocs.org
-.. _requirements: requirements/base.txt
-.. _documentation requirements: requirements/docs.txt

docs/_static/.gitkeep

@@ -4,7 +4,8 @@ Release Notes
 0.10.0 (Unreleased)
 -------------------
 
-* Compatibility with Django 1.6/1.7 and Python 2.7/3
+* Compatibility with Django 1.6 with Python 2.7 or Python 3.3
+* Compatibility with Django 1.7 with Python 2.7 or Python 3.4
 * Flake8 compliance
 * Drops support for testing with Jenkins
 

docs/releasenotes.rst

@@ -1,22 +1,26 @@
 Testing
 =======
 
-Test requirements are listed `here <../requirements/tests.txt>`_.
+Test requirements are listed in `requirements/tests.txt` file in the `project
+source <https://github.com/caktus/django-timepiece>`_. These requirements are
+in addition to the main project requirements in `requirements/base.html`.
 
-You can run tests against your installation of django-timepiece using the
-Django test runner::
+After you have installed `django-timepiece` in your project, you can use the
+Django test runner to run tests against your installation::
 
-    python manage.py test
+    python manage.py test timepiece timepiece.contracts timepiece.crm timepiece.entries timepiece.reports
 
-Or with specific apps::
+Tests in Development
+====================
 
-    python manage.py test timepiece timepiece.crm timepiece.reports
-
-You can also use tox to run tests against a specific environment::
+To easily run tests against different environments that `django-timepiece`
+supports, download the source and navigate to the `django-timepiece`
+directory. From there, you can use tox to run tests against a specific
+environment::
 
     tox -e py3.4-django1.7
 
 Or omit the `-e` argument to run tests against all combinations of Python
-and Django that django-timepiece supports. By default tox uses the example
+and Django that `django-timepiece` supports. By default tox uses the example
 project test settings, but you can specify different test settings using the
-``--settings`` flag. You can also specify which apps to test against.
+``--settings`` flag. You can also specify a subset of apps to test against.

docs/testing.rst

@@ -2,3 +2,4 @@ docutils>=0.12
 Sphinx>=1.2.3
   Jinja2>=2.7.3
   MarkupSafe>=0.23
+  Pygments>=2.0.2

requirements/docs.txt

@@ -98,7 +98,6 @@ def test_post_valid(self):
         self.assertEquals(obj.is_active, self.post_data['is_active']),
         self.assertEquals(obj.is_staff, self.post_data['is_staff']),
         groups = obj.groups.values_list('pk', flat=True)
-        self.assertEqual(len(groups), len(self.post_data['groups']))
         self.assertEqual(sorted(groups), sorted(self.post_data['groups']))
         self.assertTrue(obj.check_password(self.post_data['password1']))
 
@@ -212,7 +211,6 @@ def _assert_no_change(self):
         self.assertEquals(obj.is_staff, self.obj.is_staff)
         groups1 = obj.groups.values_list('pk', flat=True)
         groups2 = self.obj.groups.values_list('pk', flat=True)
-        self.assertEqual(len(groups1), len(groups2))
         self.assertEqual(sorted(groups1), sorted(groups2))
 
     def test_get_no_permission(self):
@@ -260,7 +258,6 @@ def test_post_valid(self):
         self.assertEquals(obj.is_active, self.post_data['is_active'])
         self.assertEquals(obj.is_staff, self.post_data['is_staff'])
         groups = obj.groups.values_list('pk', flat=True)
-        self.assertEqual(len(groups), len(self.post_data['groups']))
         self.assertEqual(sorted(groups), sorted(self.post_data['groups']))
 
     def test_post_invalid(self):

timepiece/crm/tests/test_users.py

@@ -405,7 +405,7 @@ def pause_all(self):
         """
         Pause all open entries
         """
-        entries = self.user.timepiece_entries.filter(end_time__isnull=True).all()
+        entries = self.user.timepiece_entries.filter(end_time__isnull=True)
         for entry in entries:
             entry.pause()
             entry.save()