Skip to content

Commit 31d401f

Browse files
committed
Squashed commit of the following:
commit b29dfc6 Author: Tom Augspurger <[email protected]> Date: Thu Aug 16 10:45:38 2018 -0500 Support NDFrame.shift with EAs Uses take internally. Closes pandas-dev#22386 commit b5d81cf Author: William Ayd <[email protected]> Date: Thu Aug 16 03:54:18 2018 -0700 Bump pytest (pandas-dev#22320) commit f07a790 Author: jbrockmendel <[email protected]> Date: Thu Aug 16 03:46:58 2018 -0700 Make more of numpy_helper unnecessary (pandas-dev#22344) commit 7b80d4d Author: Graham Inggs <[email protected]> Date: Thu Aug 16 12:43:02 2018 +0200 Drop redundant TestLocale (pandas-dev#22349) commit 6bcfc46 Author: Matthew Roeschke <[email protected]> Date: Thu Aug 16 03:32:31 2018 -0700 Fix failing dateutil test (pandas-dev#22354) commit 86e8f23 Author: jbrockmendel <[email protected]> Date: Thu Aug 16 03:08:09 2018 -0700 remove last cython: nprofile comments (pandas-dev#22371) commit 70e6f7c Author: Joris Van den Bossche <[email protected]> Date: Wed Aug 15 18:09:50 2018 +0200 DOC: edit docstring example to prevent segfault (pandas-dev#21824) (pandas-dev#22368)
1 parent 3bcf57e commit 31d401f

Some content is hidden

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

47 files changed

+111
-88
lines changed

ci/environment-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88
- flake8
99
- flake8-comprehensions
1010
- moto
11-
- pytest>=3.1
11+
- pytest>=3.6
1212
- python-dateutil>=2.5.0
1313
- python=3
1414
- pytz

ci/requirements_dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ NumPy
55
flake8
66
flake8-comprehensions
77
moto
8-
pytest>=3.1
8+
pytest>=3.6
99
python-dateutil>=2.5.0
1010
pytz
1111
setuptools>=24.2.0

doc/source/contributing.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -652,13 +652,13 @@ Adding tests is one of the most common requests after code is pushed to *pandas*
652652
it is worth getting in the habit of writing tests ahead of time so this is never an issue.
653653

654654
Like many packages, *pandas* uses `pytest
655-
<http://doc.pytest.org/en/latest/>`_ and the convenient
655+
<http://docs.pytest.org/en/latest/>`_ and the convenient
656656
extensions in `numpy.testing
657657
<http://docs.scipy.org/doc/numpy/reference/routines.testing.html>`_.
658658

659659
.. note::
660660

661-
The earliest supported pytest version is 3.1.0.
661+
The earliest supported pytest version is 3.6.0.
662662

663663
Writing tests
664664
~~~~~~~~~~~~~
@@ -702,7 +702,7 @@ Transitioning to ``pytest``
702702
class TestReallyCoolFeature(object):
703703
....
704704
705-
Going forward, we are moving to a more *functional* style using the `pytest <http://doc.pytest.org/en/latest/>`__ framework, which offers a richer testing
705+
Going forward, we are moving to a more *functional* style using the `pytest <http://docs.pytest.org/en/latest/>`__ framework, which offers a richer testing
706706
framework that will facilitate testing and developing. Thus, instead of writing test classes, we will write test functions like this:
707707

708708
.. code-block:: python
@@ -766,7 +766,7 @@ A test run of this yields
766766
767767
((pandas) bash-3.2$ pytest test_cool_feature.py -v
768768
=========================== test session starts ===========================
769-
platform darwin -- Python 3.6.2, pytest-3.2.1, py-1.4.31, pluggy-0.4.0
769+
platform darwin -- Python 3.6.2, pytest-3.6.0, py-1.4.31, pluggy-0.4.0
770770
collected 11 items
771771
772772
tester.py::test_dtypes[int8] PASSED
@@ -788,7 +788,7 @@ Tests that we have ``parametrized`` are now accessible via the test name, for ex
788788
789789
((pandas) bash-3.2$ pytest test_cool_feature.py -v -k int8
790790
=========================== test session starts ===========================
791-
platform darwin -- Python 3.6.2, pytest-3.2.1, py-1.4.31, pluggy-0.4.0
791+
platform darwin -- Python 3.6.2, pytest-3.6.0, py-1.4.31, pluggy-0.4.0
792792
collected 11 items
793793
794794
test_cool_feature.py::test_dtypes[int8] PASSED
@@ -837,7 +837,7 @@ On Windows, one can type::
837837
This can significantly reduce the time it takes to locally run tests before
838838
submitting a pull request.
839839
840-
For more, see the `pytest <http://doc.pytest.org/en/latest/>`_ documentation.
840+
For more, see the `pytest <http://docs.pytest.org/en/latest/>`_ documentation.
841841
842842
.. versionadded:: 0.20.0
843843

doc/source/install.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,15 +202,15 @@ pandas is equipped with an exhaustive set of unit tests, covering about 97% of
202202
the code base as of this writing. To run it on your machine to verify that
203203
everything is working (and that you have all of the dependencies, soft and hard,
204204
installed), make sure you have `pytest
205-
<http://doc.pytest.org/en/latest/>`__ and run:
205+
<http://docs.pytest.org/en/latest/>`__ >= 3.6 and run:
206206

207207
::
208208

209209
>>> import pandas as pd
210210
>>> pd.test()
211211
running: pytest --skip-slow --skip-network C:\Users\TP\Anaconda3\envs\py36\lib\site-packages\pandas
212212
============================= test session starts =============================
213-
platform win32 -- Python 3.6.2, pytest-3.2.1, py-1.4.34, pluggy-0.4.0
213+
platform win32 -- Python 3.6.2, pytest-3.6.0, py-1.4.34, pluggy-0.4.0
214214
rootdir: C:\Users\TP\Documents\Python\pandasdev\pandas, inifile: setup.cfg
215215
collected 12145 items / 3 skipped
216216

doc/source/whatsnew/v0.23.5.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ Fixed Regressions
2626
-
2727
-
2828

29+
30+
Development
31+
~~~~~~~~~~~
32+
- The minimum required pytest version has been increased to 3.6 (:issue:`22319`)
33+
2934
.. _whatsnew_0235.bug_fixes:
3035

3136
Bug Fixes

doc/source/whatsnew/v0.24.0.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ ExtensionType Changes
462462
- Added ``ExtensionDtype._is_numeric`` for controlling whether an extension dtype is considered numeric (:issue:`22290`).
463463
- The ``ExtensionArray`` constructor, ``_from_sequence`` now take the keyword arg ``copy=False`` (:issue:`21185`)
464464
- Bug in :meth:`Series.get` for ``Series`` using ``ExtensionArray`` and integer index (:issue:`21257`)
465+
- :meth:`~Series.shift` now works with extension arrays, rather than raising an AttributeError (:isseu:`22386`)
465466
- :meth:`Series.combine()` works correctly with :class:`~pandas.api.extensions.ExtensionArray` inside of :class:`Series` (:issue:`20825`)
466467
- :meth:`Series.combine()` with scalar argument now works for any function type (:issue:`21248`)
467468
- Added ``ExtensionDtype._is_numeric`` for controlling whether an extension dtype is considered numeric.

pandas/_libs/algos.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# cython: profile=False
1+
# -*- coding: utf-8 -*-
22

33
cimport cython
44
from cython cimport Py_ssize_t

pandas/_libs/groupby.pyx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# -*- coding: utf-8 -*-
2-
# cython: profile=False
32

43
cimport cython
54
from cython cimport Py_ssize_t

pandas/_libs/hashing.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# cython: profile=False
1+
# -*- coding: utf-8 -*-
22
# Translated from the reference implementation
33
# at https://github.com/veorq/SipHash
44

pandas/_libs/hashtable.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# cython: profile=False
1+
# -*- coding: utf-8 -*-
22

33
cimport cython
44

0 commit comments

Comments
 (0)