Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit eccf830

Browse files
author
Vedant Nanda
committed
Revert "Merge branch 'first_try' of https://github.com/nvedant07/matplotlib into first_try"
This reverts commit 85f63e3, reversing changes made to f32377f.
1 parent bc70403 commit eccf830

File tree

150 files changed

+2385
-3660
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+2385
-3660
lines changed

‎.coveragerc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
[run]
2-
branch = true
3-
source =
2+
source=
43
matplotlib
54
mpl_toolkits
6-
omit = matplotlib/_version.py
75

86
[report]
97
exclude_lines =

‎.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ matrix:
5656
env: MOCK=mock NUMPY=numpy==1.7.1
5757
- python: 3.4
5858
env: PYTHON_ARGS=-OO
59+
- python: 3.5
60+
env: PANDAS=pandas DELETE_FONT_CACHE=1
5961
- python: 3.5
6062
env: BUILD_DOCS=true
6163
- python: 3.5
@@ -152,7 +154,7 @@ script:
152154
# Workaround for pytest-xdist flaky collection order
153155
# https://github.com/pytest-dev/pytest/issues/920
154156
# https://github.com/pytest-dev/pytest/issues/1075
155-
export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))')
157+
export PYTHONHASHSEED=$(shuf -i 1-4294967295 -n 1)
156158
echo PYTHONHASHSEED=$PYTHONHASHSEED
157159
158160
echo The following args are passed to pytest $PYTEST_ARGS $RUN_PEP8

‎INSTALL

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ install matplotlib using pip_::
6464
python -m pip install matplotlib
6565

6666
In case Python 2.7 or 3.4 are not installed for all users,
67-
the Microsoft Visual C++ 2008
68-
(`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=15336>`__
67+
the Microsoft Visual C++ 2008 (
68+
`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=15336>`__
6969
or
7070
`32 bit <https://www.microsoft.com/en-us/download/details.aspx?id=29>`__
71-
for Python 2.7) or Microsoft Visual C++ 2010
72-
(`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
71+
for Python 2.7) or Microsoft Visual C++ 2010 (
72+
`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
7373
or
7474
`32 bit <https://www.microsoft.com/en-us/download/details.aspx?id=5555>`__
7575
for Python 3.4) redistributable packages need to be installed.
@@ -106,15 +106,14 @@ or example code.
106106
If you want to try the many demos that come in the matplotlib source
107107
distribution, download the :file:`*.tar.gz` file and look in the
108108
:file:`examples` subdirectory.
109-
To run the test suite:
110-
111-
* extract the :file:`lib\\matplotlib\\tests` or
112-
:file:`lib\\mpl_toolkits\\tests` directories from the source distribution;
113-
* install test dependencies: `pytest <https://pypi.python.org/pypi/pytest>`_,
114-
`mock <https://pypi.python.org/pypi/mock>`_, Pillow, MiKTeX, GhostScript,
115-
ffmpeg, avconv, mencoder, ImageMagick, and `Inkscape
116-
<https://inkscape.org/>`_;
117-
* run ``py.test path\\to\\tests\\directory``.
109+
To run the test suite, copy the :file:`lib\\matplotlib\\tests` and
110+
:file:`lib\\mpl_toolkits\\tests` directories from the source
111+
distribution to :file:`sys.prefix\\Lib\\site-packages\\matplotlib` and
112+
:file:`sys.prefix\\Lib\\site-packages\\mpl_toolkits` respectively, and
113+
install `nose <https://pypi.python.org/pypi/nose>`_, `mock
114+
<https://pypi.python.org/pypi/mock>`_, Pillow, MiKTeX, GhostScript,
115+
ffmpeg, avconv, mencoder, ImageMagick, and `Inkscape
116+
<https://inkscape.org/>`_.
118117

119118

120119

@@ -134,15 +133,13 @@ latest git version :ref:`install-from-git`.
134133
The standard environment variables `CC`, `CXX`, `PKG_CONFIG` are respected.
135134
This means you can set them if your toolchain is prefixed. This may be used for
136135
cross compiling.
137-
::
138136

139137
export CC=x86_64-pc-linux-gnu-gcc
140138
export CXX=x86_64-pc-linux-gnu-g++
141139
export PKG_CONFIG=x86_64-pc-linux-gnu-pkg-config
142140

143141
Once you have satisfied the requirements detailed below (mainly
144-
python, numpy, libpng and freetype), you can build matplotlib.
145-
::
142+
python, numpy, libpng and freetype), you can build matplotlib::
146143

147144
cd matplotlib
148145
python setup.py build
@@ -225,7 +222,7 @@ Required Dependencies
225222
Dependencies for python 2
226223
^^^^^^^^^^^^^^^^^^^^^^^^^
227224

228-
`backports.functools_lru_cache <https://pypi.python.org/pypi/backports.functools_lru_cache>`_
225+
`functools32 <https://pypi.python.org/pypi/functools32>`_
229226
Required for compatibility if running on Python 2.7.
230227

231228
`subprocess32 <https://pypi.python.org/pypi/subprocess32/>`_

‎README.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,17 @@ Testing
2020

2121
After installation, you can launch the test suite::
2222

23-
py.test
23+
python tests.py
2424

2525
Or from the Python interpreter::
2626

2727
import matplotlib
2828
matplotlib.test()
2929

3030
Consider reading http://matplotlib.org/devel/coding_guide.html#testing for
31-
more information. Note that the test suite requires pytest and, on Python 2.7,
32-
mock. Please install with pip or your package manager of choice.
31+
more information. Note that the test suite requires nose and on Python 2.7 mock
32+
which are not installed by default. Please install with pip or your package
33+
manager of choice.
3334

3435
Contact
3536
=======

‎README.win.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ conda install pyqt
2727
# this package is only available in the conda-forge channel
2828
conda install -c conda-forge msinttypes
2929
# for python 2.7
30-
conda install -c conda-forge backports.functools_lru_cache
30+
conda install -c conda-forge functools32
3131

3232
# copy the libs which have "wrong" names
3333
set LIBRARY_LIB=%CONDA_DEFAULT_ENV%\Library\lib

‎appveyor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ environment:
1414
CMD_IN_ENV: "cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd"
1515
# Workaround for https://github.com/conda/conda-build/issues/636
1616
PYTHONIOENCODING: "UTF-8"
17-
PYTEST_ARGS: -ra --timeout=300 --durations=25 -n %NUMBER_OF_PROCESSORS% --cov-report= --cov=lib -m "not network"
17+
PYTEST_ARGS: -ra --timeout=300 --durations=25 -n %NUMBER_OF_PROCESSORS% --cov-report= --cov=lib
1818
USE_PYTEST: no
1919
PYTHONHASHSEED: 0 # Workaround for pytest-xdist flaky collection order
2020
# https://github.com/pytest-dev/pytest/issues/920
@@ -94,7 +94,7 @@ install:
9494
mock sphinx
9595
- activate test-environment
9696
- cmd: echo %PYTHON_VERSION% %TARGET_ARCH%
97-
- cmd: IF %PYTHON_VERSION% == 2.7 conda install -q backports.functools_lru_cache
97+
- cmd: IF %PYTHON_VERSION% == 2.7 conda install -q functools32
9898
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
9999
- conda install -q pytest "pytest-cov>=2.3.1" pytest-timeout pytest-xdist
100100

@@ -140,8 +140,8 @@ test_script:
140140
- if x%USE_PYTEST% == xno python tests.py %PYTEST_ARGS%
141141
# Generate a html for visual tests
142142
- python visual_tests.py
143-
- pip install codecov
144-
- codecov -e PYTHON_VERSION PLATFORM
143+
- if x%USE_PYTEST% == xyes pip install codecov
144+
- if x%USE_PYTEST% == xyes codecov -e PYTHON_VERSION PLATFORM
145145

146146
after_test:
147147
# After the tests were a success, build packages (wheels and conda)

‎build_alllocal.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
:: # this package is only available in the conda-forge channel
88
:: conda install -c conda-forge msinttypes
99
:: if you build on py2.7:
10-
:: conda install -c conda-forge backports.functools_lru_cache
10+
:: conda install -c conda-forge functools32
1111

1212
set TARGET=bdist_wheel
1313
IF [%1]==[] (

‎ci/codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ coverage:
2424
paths: '!lib/.*/tests/.*'
2525

2626
tests:
27-
target: 97.9%
27+
target: 97.7%
2828
paths: 'lib/.*/tests/.*'

‎ci/conda_recipe/meta.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ requirements:
3030
- freetype 2.6*
3131
- msinttypes # [win]
3232
- cycler >=0.10
33-
- pytest >=3.0.0
33+
- nose
3434
- pyparsing
3535
- pytz
3636
# - py2cairo # [linux and py2k]
@@ -39,7 +39,7 @@ requirements:
3939
- zlib 1.2* # [win]
4040
- pyqt # [not osx]
4141
- tk 8.5* # [linux]
42-
- backports.functools_lru_cache # [py2k]
42+
- functools32 # [py2k]
4343

4444
run:
4545
- python
@@ -54,7 +54,7 @@ requirements:
5454
- libpng >=1.6.21,<1.7
5555
- pyqt # [not osx]
5656
- tk 8.5* # [linux and win]
57-
- backports.functools_lru_cache # [py2k]
57+
- functools32 # [py2k]
5858

5959
test:
6060
imports:

‎doc/_templates/layout.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ <h3>{{ _('Navigation') }}</h3>
8282
VERSION: '{{ release|e }}',
8383
COLLAPSE_INDEX: false,
8484
FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
85-
HAS_SOURCE: {{ has_source|lower }},
86-
SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
85+
HAS_SOURCE: {{ has_source|lower }}
8786
};
8887
</script>
8988
{%- for scriptfile in script_files %}

0 commit comments

Comments
 (0)