Skip to content

Commit

Permalink
Merge pull request #57 from rlaverde/misc-fixes
Browse files Browse the repository at this point in the history
PR: Misc fixes
  • Loading branch information
ccordoba12 committed Aug 15, 2017
2 parents 6514645 + 8413cee commit 95e2ce8
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,10 @@ __pycache__

# Coverage
.coverage

# Build files
build/
dist/

# git .orig files
*.orig
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ This project depends on:
Overview
--------

.. image:: doc/reports_screenshot.png
.. image:: https://github.com/spyder-ide/spyder-reports/blob/master/doc/reports_screenshot.png
:alt: Reports Screenshot
2 changes: 0 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ machine:
# python3.5 conda, pweave 0.2.5
# python2.7 conda, pweave 0.2.5
PY_VERSIONS: "3.6 3.5 2.7"
# For Coveralls
COVERALLS_REPO_TOKEN: Itl2uptQrhv57IMJfWwp5ZuAE4yKPgNtX
# Environment variables used by astropy helpers
TRAVIS_OS_NAME: "linux"
CONDA_DEPENDENCIES_FLAGS: "--quiet"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def get_description():
return data


REQUIREMENTS = ['spyder>=3.2.0', 'pweave']
REQUIREMENTS = ['spyder>=3.2.0', 'pweave', 'matplotlib']


setup(
Expand Down
2 changes: 1 addition & 1 deletion spyder_reports/tests/test_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def add_dockwidget(*args):

reports.main.add_dockwidget = add_dockwidget

with qtbot.waitSignal(reports.sig_render_finished, timeout=6000) as sig:
with qtbot.waitSignal(reports.sig_render_finished, timeout=10000) as sig:
reports.register_plugin()

ok, filename, error = sig.args
Expand Down

0 comments on commit 95e2ce8

Please sign in to comment.