Skip to content

Commit cdd1543

Browse files
authored
Merge pull request #390 from nschloe/remove-scipy-test-dep
Remove scipy test dep
2 parents d9f636f + 012010c commit cdd1543

File tree

6 files changed

+6814
-4795
lines changed

6 files changed

+6814
-4795
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ jobs:
99
- uses: actions/setup-python@v1
1010
with:
1111
python-version: "3.x"
12-
- uses: actions/checkout@v1
12+
- uses: actions/checkout@v2
1313
- name: Lint with flake8
1414
run: |
15-
pip install --upgrade pip
1615
pip install flake8
1716
flake8 .
1817
- name: Lint with black
@@ -22,16 +21,18 @@ jobs:
2221
2322
build:
2423
runs-on: ubuntu-latest
24+
strategy:
25+
matrix:
26+
python-version: [3.6, 3.7, 3.8]
2527
steps:
2628
- uses: actions/setup-python@v1
2729
with:
2830
python-version: "3.x"
29-
- uses: actions/checkout@v1
31+
- uses: actions/checkout@v2
3032
- name: Install dependencies
31-
run: sudo apt-get install -y texlive-latex-base texlive-latex-extra context python3-tk python3-scipy
33+
run: sudo apt-get install -y texlive-latex-base texlive-latex-extra context python3-tk
3234
- name: Install package
3335
run: |
34-
pip install --upgrade pip
3536
pip install .
3637
- name: Extract tests from README
3738
run: |

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<p align="center">
2-
<img alt="tikzplotlib" src="https://nschloe.github.io/tikzplotlib/logo-tikzplotlib.svg" width="60%">
2+
<a href="https://github.com/nschloe/tikzplotlib"><img alt="tikzplotlib" src="https://nschloe.github.io/tikzplotlib/logo-tikzplotlib.svg" width="60%"></a>
3+
<p align="center">The artist formerly known as _matplotlib2tikz._</p>
34
</p>
45

56
[![CircleCI](https://img.shields.io/circleci/project/github/nschloe/tikzplotlib/master.svg?style=flat-square)](https://circleci.com/gh/nschloe/tikzplotlib/tree/master)
67
[![codecov](https://img.shields.io/codecov/c/github/nschloe/tikzplotlib.svg?style=flat-square)](https://codecov.io/gh/nschloe/tikzplotlib)
78
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square)](https://github.com/psf/black)
89
[![Documentation Status](https://readthedocs.org/projects/tikzplotlib/badge/?version=latest&style=flat-square)](https://readthedocs.org/projects/tikzplotlib/?badge=latest)
910
[![awesome](https://img.shields.io/badge/awesome-yes-brightgreen.svg?style=flat-square)](https://github.com/nschloe/tikzplotlib)
11+
[![PyPI pyversions](https://img.shields.io/pypi/pyversions/tikzplotlib.svg?style=flat-square)](https://pypi.org/pypi/tikzplotlib/)
1012
[![PyPi Version](https://img.shields.io/pypi/v/tikzplotlib.svg?style=flat-square)](https://pypi.org/project/tikzplotlib)
1113
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1173089.svg?style=flat-square)](https://doi.org/10.5281/zenodo.1173089)
1214
[![GitHub stars](https://img.shields.io/github/stars/nschloe/tikzplotlib.svg?style=flat-square&logo=github&label=Stars&logoColor=white)](https://github.com/nschloe/tikzplotlib)
@@ -105,11 +107,11 @@ Notably, [3D plots don't work](https://github.com/matplotlib/matplotlib/issues/7
105107
### Installation
106108

107109
tikzplotlib is [available from the Python Package
108-
Index](https://pypi.org/project/tikzplotlib/), so simply type
110+
Index](https://pypi.org/project/tikzplotlib/), so simply do
109111
```
110-
pip3 install tikzplotlib --user
112+
pip install tikzplotlib
111113
```
112-
to install/update.
114+
to install.
113115

114116

115117
### Usage

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
about["__status__"],
2727
about["__license__"],
2828
"Operating System :: OS Independent",
29-
"Programming Language :: Python",
3029
"Programming Language :: Python :: 3",
30+
"Programming Language :: Python :: 3.6",
31+
"Programming Language :: Python :: 3.7",
32+
"Programming Language :: Python :: 3.8",
3133
"Topic :: Multimedia :: Graphics :: Graphics Conversion",
3234
"Topic :: Scientific/Engineering :: Visualization",
3335
],

test/test_contourf.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import matplotlib.pyplot as plt
22
import numpy as np
3-
from scipy.stats import multivariate_normal
43

54
from helpers import assert_equality
65

76

87
def plot():
9-
mean = np.array([1, 1])
10-
cov = np.eye(2)
118
nbins = 5
129

1310
fig = plt.figure()
@@ -22,7 +19,7 @@ def plot():
2219
pos = np.empty(xi.shape + (2,))
2320
pos[:, :, 0] = xi
2421
pos[:, :, 1] = yi
25-
zi = multivariate_normal(mean, cov, allow_singular=True, seed=0).pdf(pos)
22+
zi = 2 - (xi - 1) ** 2 - (yi - 1) ** 2
2623
ax.contourf(xi, yi, zi, 250)
2724

2825
ax.set_xlim(x_min, x_max)
@@ -36,7 +33,9 @@ def test():
3633

3734

3835
if __name__ == "__main__":
39-
import helpers
36+
plot()
37+
plt.show()
38+
# import helpers
4039

41-
helpers.compare_mpl_tex(plot)
40+
# helpers.compare_mpl_tex(plot)
4241
# helpers.print_tree(plot())

0 commit comments

Comments
 (0)