Skip to content

Commit

Permalink
Fixed tox problems
Browse files Browse the repository at this point in the history
  • Loading branch information
benbaror committed Apr 6, 2017
1 parent 3b6ed65 commit 9f250d0
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 39 deletions.
22 changes: 0 additions & 22 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ Overview
- | |travis| |requires|
| |coveralls| |codecov|
| |landscape| |scrutinizer| |codacy| |codeclimate|
* - package
- |version| |downloads| |wheel| |supported-versions| |supported-implementations|
.. |docs| image:: https://readthedocs.org/projects/replotlib/badge/?style=flat
:target: https://readthedocs.org/projects/replotlib
Expand Down Expand Up @@ -48,26 +46,6 @@ Overview
:target: https://codeclimate.com/github/benbaror/replotlib
:alt: CodeClimate Quality Status

.. |version| image:: https://img.shields.io/pypi/v/replotlib.svg?style=flat
:alt: PyPI Package latest release
:target: https://pypi.python.org/pypi/replotlib

.. |downloads| image:: https://img.shields.io/pypi/dm/replotlib.svg?style=flat
:alt: PyPI Package monthly downloads
:target: https://pypi.python.org/pypi/replotlib

.. |wheel| image:: https://img.shields.io/pypi/wheel/replotlib.svg?style=flat
:alt: PyPI Wheel
:target: https://pypi.python.org/pypi/replotlib

.. |supported-versions| image:: https://img.shields.io/pypi/pyversions/replotlib.svg?style=flat
:alt: Supported versions
:target: https://pypi.python.org/pypi/replotlib

.. |supported-implementations| image:: https://img.shields.io/pypi/implementation/replotlib.svg?style=flat
:alt: Supported implementations
:target: https://pypi.python.org/pypi/replotlib

.. |scrutinizer| image:: https://img.shields.io/scrutinizer/g/benbaror/replotlib/master.svg?style=flat
:alt: Scrutinizer Status
:target: https://scrutinizer-ci.com/g/benbaror/replotlib/
Expand Down
2 changes: 2 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
sphinx>=1.3
sphinx-py3doc-enhanced-theme
h5py
matplotlib
-e .
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ def read(*names, **kwargs):
],
install_requires=[
'click',
'matplotlib',
'h5py',
],
extras_require={
# eg:
Expand Down
8 changes: 5 additions & 3 deletions src/replotlib/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
Also see (1) from http://click.pocoo.org/5/setuptools/#setuptools-integration
"""
import click
from . import Axes
import json
import matplotlib.pyplot as plt
from collections import OrderedDict

import click
import matplotlib.pyplot as plt

from . import Axes


def replot(file_name, file_type, style={}, savefig=False, **kargs):
plt.figure()
Expand Down
11 changes: 4 additions & 7 deletions src/replotlib/replot.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"""Provide the basic Axes class."""
import json
import os
import h5py
from collections import OrderedDict
from functools import wraps

import h5py
import matplotlib.pyplot as plt
from collections import OrderedDict
from corner import corner
import json


class HDF5IO(object):
Expand Down Expand Up @@ -227,6 +227,3 @@ def apply_style(self, kwargs, extra_styles=None):

except KeyError:
pass

def _corner(self, *arg, **kargs):
corner(*arg, **kargs)
6 changes: 3 additions & 3 deletions tests/test_replotlib.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import numpy as np
import os
from replotlib import Axes
import matplotlib.pyplot as plt
from contextlib import contextmanager

import matplotlib.pyplot as plt
import numpy as np
from click.testing import CliRunner

from replotlib import Axes
from replotlib.cli import main

PATH = os.path.dirname(os.path.realpath(__file__))
Expand Down
9 changes: 5 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
envlist =
clean,
check,
{py27,py35},
{py3,py27},
report,
docs

[testenv]
basepython =
{py27,docs,spell}: {env:TOXPYTHON:python2.7}
py35: {env:TOXPYTHON:python3.5}
{clean,check,report,coveralls,codecov}: python3.5
py27: {env:TOXPYTHON:python2.7}
py3: {env:TOXPYTHON:python3}
{clean,check,report,coveralls,codecov,docs,spell}: python3
bootstrap: python
setenv =
PYTHONPATH={toxinidir}/tests
Expand Down Expand Up @@ -48,6 +48,7 @@ commands =
skip_install = true
deps =
-r{toxinidir}/docs/requirements.txt
h5py
sphinxcontrib-spelling
pyenchant

Expand Down

0 comments on commit 9f250d0

Please sign in to comment.