Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
8344d56
Merge pull request #1 from earthlab/master
nkorinek Feb 6, 2020
b87394d
Merge pull request #2 from earthlab/master
nkorinek Feb 12, 2020
7cf2703
Merge pull request #3 from earthlab/master
nkorinek Feb 12, 2020
c4d904e
Merge pull request #4 from earthlab/master
nkorinek Feb 13, 2020
c6deb54
Merge pull request #5 from earthlab/master
nkorinek Feb 13, 2020
30b4aa1
Merge pull request #7 from earthlab/master
nkorinek Feb 17, 2020
6ab2486
Merge pull request #8 from earthlab/master
nkorinek Mar 3, 2020
5077e25
Merge pull request #9 from earthlab/master
nkorinek Mar 7, 2020
4ff1b26
Merge pull request #10 from earthlab/master
nkorinek Mar 11, 2020
de25545
Merge pull request #11 from earthlab/master
nkorinek Mar 19, 2020
2f2f01d
Merge pull request #12 from earthlab/master
nkorinek Mar 19, 2020
031a710
Merge pull request #13 from earthlab/master
nkorinek Mar 20, 2020
7bb3216
Merge pull request #14 from earthlab/master
nkorinek Mar 23, 2020
cd169d3
Merge pull request #15 from earthlab/master
nkorinek Mar 24, 2020
e0e3c34
Merge pull request #16 from earthlab/master
nkorinek Mar 30, 2020
60e57e4
Merge pull request #17 from earthlab/master
nkorinek Apr 6, 2020
5569d18
Merge pull request #18 from earthlab/master
nkorinek Apr 20, 2020
90b8128
Update setuptools from 42.0.2 to 45.2.0 (#190)
pyup-bot Feb 11, 2020
c96321c
raster inherits from vector rather than base (#76)
Feb 12, 2020
8e26cba
Allow geodataframes in assert_polygons (#188)
nkorinek Feb 13, 2020
49c4c24
fixing a few syntax errors (#194)
Feb 13, 2020
da32ef9
update changelog for release
Feb 14, 2020
f842822
Bump version: 0.1.1 → 0.1.2
Feb 14, 2020
eee471f
Add flake8 fix [WIP] (#199)
nkorinek Mar 2, 2020
77e8f76
Assert string accept spaces (#205)
nkorinek Mar 6, 2020
99e961a
Update codecov to 2.0.16 (#202)
pyup-bot Mar 7, 2020
3c37b7d
Contributors update (#213)
nkorinek Mar 10, 2020
d2dfa5a
Update setuptools from 45.2.0 to 46.0.0 (#215)
pyup-bot Mar 10, 2020
6b142e8
Add Assert points function & cleanup duplicate methods (#203)
nkorinek Mar 19, 2020
7ea9490
Update pytest from 5.3.5 to 5.4.1
pyup-bot Mar 13, 2020
a782271
merge
nkorinek Apr 20, 2020
e7b4652
Additional vector tests (#212)
nkorinek Mar 23, 2020
0f2fc16
Add tests to the Autograde module (#224)
nkorinek Mar 24, 2020
27251c3
Hist bin midpoints (#204)
nkorinek Mar 26, 2020
f3c384f
Update setuptools from 46.1.1 to 46.1.3 (#231)
pyup-bot Mar 26, 2020
654b3d1
Title assert accepts strings (#229)
nkorinek Apr 2, 2020
34e20da
M2r remove (#247)
nkorinek Apr 20, 2020
eb4c2d8
merge
nkorinek Apr 20, 2020
3f07d9b
# This is a combination of 2 commits.
pyup-bot Feb 11, 2020
beae1b5
Updating in order to squash commits!
nkorinek Apr 20, 2020
66b8206
fix copyright on docs (#244)
Apr 21, 2020
63fa4e0
Add pillow (#254)
Apr 23, 2020
f52150a
Merge
nkorinek Apr 27, 2020
5f0fd98
Merge branch 'earthlab-master'
nkorinek Apr 27, 2020
efab5a2
Changelog to rst (#267)
nkorinek May 1, 2020
a7dfdc7
setup greetings! (#257)
May 1, 2020
7b887bd
merge
nkorinek May 7, 2020
1a2252a
Merge branch 'earthlab-master'
nkorinek May 7, 2020
d3c1ba6
Add template for PR
May 12, 2020
a850b76
Timeseries tests (#273)
nkorinek May 13, 2020
43bc9cb
Update pytest from 5.4.1 to 5.4.2 (#275)
pyup-bot May 14, 2020
f81f819
remove rebase
May 14, 2020
57646ec
Test coverage for lines (#274)
nkorinek May 14, 2020
9c5facf
merge
nkorinek May 18, 2020
082e0b9
Merge branch 'master' of https://github.com/earthlab/matplotcheck
nkorinek Jun 29, 2020
2b68eba
Update codecov from 2.1.7 to 2.1.9
pyup-bot Aug 21, 2020
2809743
Update pre-commit from 1.21.0 to 2.7.1
pyup-bot Aug 23, 2020
e2d1abc
Merge branch 'master' of https://github.com/earthlab/matplotcheck
nkorinek Aug 26, 2020
b7a0c1c
Update setuptools from 47.3.1 to 50.0.0
pyup-bot Aug 30, 2020
5728943
Update sphinx-autobuild from 0.7.1 to 2020.9.1
pyup-bot Aug 31, 2020
55c6d6e
Merge branch 'master' of https://github.com/earthlab/matplotcheck
nkorinek Aug 31, 2020
9973f9c
Merge branch 'pyup-update-sphinx-autobuild-0.7.1-to-2020.9.1' of http…
nkorinek Aug 31, 2020
e82051d
Merge branch 'pyup-update-setuptools-47.3.1-to-50.0.0' of https://git…
nkorinek Aug 31, 2020
d746227
removed 3.5 and updated a few packages
nkorinek Aug 31, 2020
b5dbcd8
Merge branch 'pyup-update-codecov-2.1.7-to-2.1.9' of https://github.c…
nkorinek Aug 31, 2020
44ffbc5
added package updates
nkorinek Aug 31, 2020
1dc5383
removed old pip install
nkorinek Aug 31, 2020
9252868
Update sphinx_gallery from 0.7.0 to 0.8.0
pyup-bot Sep 2, 2020
f4b8e2e
Update setuptools from 47.3.1 to 50.1.0
pyup-bot Sep 3, 2020
a25d3b6
added new dep update
nkorinek Sep 3, 2020
1e87c82
added new update
nkorinek Sep 3, 2020
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
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
language: python
matrix:
include:
- os: linux
dist: xenial
python: 3.5
env: TOXENV=py35
- os: linux
dist: xenial
python: 3.6
env: TOXENV=py36
- os: linux
dist: xenial
python: 3.7
env: TOXENV=py37,black,docs
env: TOXENV=py37
- os: linux
dist: xenial
python: 3.8
env: TOXENV=py38,black,docs
- os: osx
language: generic
install:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ e.g.,::
Code style
==========

- MatPlotCheck currently only supports Python 3 (3.5+). Please test code locally
- MatPlotCheck currently only supports Python 3 (3.6+). Please test code locally
in Python 3 when possible (all supported versions will be automatically
tested on Travis CI).

Expand Down
16 changes: 8 additions & 8 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
bumpversion==0.6.0
sphinx_rtd_theme==0.5.0
sphinx_gallery==0.7.0
sphinx-autobuild==0.7.1
sphinx_gallery==0.8.0
sphinx-autobuild==2020.9.1
pytest-vcr==1.0.2
pytest-cov==2.10.0
codecov==2.1.7
pytest==5.4.3
setuptools==47.3.1
pre-commit==1.21.0
pip==19.0.3
pytest-cov==2.10.1
codecov==2.1.9
pytest==6.0.1
setuptools==50.1.0
pre-commit==2.7.1
pip==20.2.2
descartes==1.1.0
seaborn>=0.9.1
pillow==7.2.0
2 changes: 0 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: matplotcheck-dev
channels:
- conda-forge
dependencies:
# Workaround for pip 19.1 failing
- pip=19.0.3

# Core scientific python
- numpy>=1.14.0
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[tox]
envlist = py35, py36, py37, black, docs
envlist = py36, py37, py38, black, docs

[travis]
python =
3.5: py35
3.6: py36
3.7: py37, docs, black
3.7: py37
3.8: py38, docs, black

[testenv]
passenv = *
Expand Down