Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing nose dependencies #201

Merged
merged 1 commit into from
Feb 22, 2016
Merged

Removing nose dependencies #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .coveragerc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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__
Expand Down
7 changes: 3 additions & 4 deletions TESTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion appengine/resources/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# dummy app.yaml for nosegae
# dummy app.yaml for tests

api_version: 1
runtime: python27
Expand Down
1 change: 0 additions & 1 deletion container_engine/django_tutorial/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ pip-delete-this-directory.txt
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
*.log
Expand Down
4 changes: 0 additions & 4 deletions requirements-py27-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions requirements-py34-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down