Merge pull request #201 from GoogleCloudPlatform/cleanup

Removing nose dependencies
GoogleCloudPlatform · Feb 22, 2016 · 200fe87 · 200fe87
2 parents 39bdbda + b0947ad
commit 200fe87
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 19 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -3,12 +3,12 @@ include =
     appengine/*
     bigquery/*
     blog/*
+    cloud_logging/*
     compute/*
     datastore/*
+    managed_vms/*
     monitoring/*
     storage/*
-    cloud_logging/*
-    managed_vms/*
 [report]
 exclude_lines =
     pragma: NO COVER

diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,8 @@
 .coveralls.yml
-coverage-gae.json
 *.pyc
 .coverage
 .tox
 coverage.xml
-nosetests.xml
-nosetests-*.xml
 python-docs-samples.json
 service-account.json
 __pycache__

diff --git a/TESTING.md b/TESTING.md
@@ -64,14 +64,13 @@ flag:
     tox -e py27
 
 To run one particular test suite or provide additional parameters to
-``nose``, invoke tox like this:
+``py.test``, invoke tox like this:
 
-    toxe -e py27 -- storage/tests/test_list_objects.py
+    toxe -e py27 -- storage/api
 
 ### Adding new tests
 
-When adding a new top-level directory, be sure to edit ``.coveragerc``
-to include it in coveralls.
+When adding a new top-level directory, be sure to edit ``.coveragerc`` and ``tox.ini`` to include it in tests and coverage reporting.
 
 To add new tests that require Google App Engine, please place them in
 the ``appengine`` directory if possible. If you place them elsewhere,

diff --git a/appengine/resources/app.yaml b/appengine/resources/app.yaml
@@ -1,4 +1,4 @@
-# dummy app.yaml for nosegae
+# dummy app.yaml for tests
 
 api_version: 1
 runtime: python27

diff --git a/container_engine/django_tutorial/.dockerignore b/container_engine/django_tutorial/.dockerignore
@@ -13,7 +13,6 @@ pip-delete-this-directory.txt
 .coverage
 .coverage.*
 .cache
-nosetests.xml
 coverage.xml
 *,cover
 *.log

diff --git a/requirements-py27-dev.txt b/requirements-py27-dev.txt
@@ -10,16 +10,12 @@ itsdangerous==0.24
 Jinja2==2.8
 MarkupSafe==0.23
 mock==1.3.0
-nose==1.3.7
-nose-exclude==0.4.1
-nosegae==0.5.8
 pbr==1.8.1
 PyYAML==3.11
 waitress==0.8.10
 WebOb==1.6.0a0
 WebTest==2.0.20
 Werkzeug==0.11.4
-nose-timer==0.6.0
 Flask-SQLAlchemy==2.1
 PyMySQL==0.7.1
 pymemcache==1.3.5

diff --git a/requirements-py34-dev.txt b/requirements-py34-dev.txt
@@ -10,16 +10,12 @@ itsdangerous==0.24
 Jinja2==2.8
 MarkupSafe==0.23
 mock==1.3.0
-nose==1.3.7
-nose-exclude==0.4.1
-nosegae==0.5.8
 pbr==1.8.1
 PyYAML==3.11
 waitress==0.8.10
 WebOb==1.6.0a0
 WebTest==2.0.20
 Werkzeug==0.11.4
-nose-timer==0.6.0
 Flask-SQLAlchemy==2.1
 PyMySQL==0.7.1
 pymemcache==1.3.5