Skip to content

BUG GH31355 fixed by adding more relevant error message #36169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 84 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
4edc821
Backport PR #35452: DOC: Start 1.1.1 (#35458)
meeseeksmachine Jul 29, 2020
2dcb402
Backport PR #35272: CI: Unpin pytest (#35469)
meeseeksmachine Jul 30, 2020
000e674
Backport PR #35477: MAINT: Use float arange when required or intended…
meeseeksmachine Aug 1, 2020
e29d9bb
Backport PR #35470: CI: unpin isort 5 (#35134) (#35501)
meeseeksmachine Aug 1, 2020
b996b86
Backport PR #35467: CI: activate github actions on 1.1.x (PR only) (#…
meeseeksmachine Aug 4, 2020
640db0b
Backport PR #35468: CI: activate azure pipelines on 1.1.x (#35536)
meeseeksmachine Aug 4, 2020
69165d1
Backport PR #35502: CI: xfail numpy-dev (#35537)
meeseeksmachine Aug 4, 2020
1ab59a8
Backport PR #35440: BUG: CategoricalIndex.format (#35539)
meeseeksmachine Aug 4, 2020
bea9af8
Backport PR #35510: REGR: Check for float in isnaobj_old (#35540)
meeseeksmachine Aug 4, 2020
a48cc4d
Backport PR #35513: BUG: RollingGroupby respects __getitem__ (#35591)
meeseeksmachine Aug 6, 2020
d8cdcf0
Backport PR #35554: DOC: Document that read_hdf can use pickle (#35593)
meeseeksmachine Aug 6, 2020
5904807
Backport PR #35590: BUG: validate index/data length match in DataFram…
meeseeksmachine Aug 7, 2020
33ec020
Backport PR #35547: Bug fix one element series truncate (#35600)
meeseeksmachine Aug 7, 2020
3af8044
Backport PR #35582: BUG: to_timedelta fails on Int64 Series with null…
meeseeksmachine Aug 7, 2020
3b00652
Backport PR #35578: BUG: df.shift(n, axis=1) with multiple blocks (#3…
meeseeksmachine Aug 7, 2020
c1676ce
Backport PR #35562: BUG: Ensure rolling groupby doesn't segfault with…
meeseeksmachine Aug 7, 2020
6f186f7
Backport PR #35588: BUG: fix styler cell_ids arg so that blank style …
meeseeksmachine Aug 8, 2020
c5ded4d
Backport PR #35473: REGR: Fix conversion of mixed dtype DataFrame to …
meeseeksmachine Aug 8, 2020
396ba93
Backport PR #35621: CI: Linux py36_locale failures with pytest Deprec…
meeseeksmachine Aug 8, 2020
a057e74
Backport PR #35639: BUG: RollingGroupby with closed and column select…
meeseeksmachine Aug 10, 2020
7957254
Backport PR #35522: BUG: Fix assert_equal when check_exact=True for n…
meeseeksmachine Aug 10, 2020
ac40043
Backport PR #35633: BUG: DataFrame.apply with func altering row in-pl…
meeseeksmachine Aug 11, 2020
273f416
Backport PR #35647: BUG: Support custom BaseIndexers in groupby.rolli…
meeseeksmachine Aug 13, 2020
48e812b
Backport PR #35654: BUG: GH-35558 merge_asof tolerance error (#35702)
meeseeksmachine Aug 13, 2020
e8a8264
Backport PR #35673: REGR: Dataframe.reset_index() on empty DataFrame …
meeseeksmachine Aug 14, 2020
f15a60a
CI: doctest failure for read_hdf on 1.1.x (fixed in #35214 on master)…
simonjayhawkins Aug 14, 2020
a0a6549
Backport PR #35707: REGR: fix DataFrame.diff with read-only data (#35…
meeseeksmachine Aug 14, 2020
3ef3617
Backport PR #35664: BUG: Styler cell_ids fails on multiple renders (#…
meeseeksmachine Aug 14, 2020
c5031fa
Backport PR #35723: agg with list of non-aggregating functions (#35738)
meeseeksmachine Aug 15, 2020
a49bfcd
Backport PR #35754: CI: Min Pytest Cov Version/Restrict xdist version…
meeseeksmachine Aug 17, 2020
ac8845b
Backport PR #35697: REGR: Don't ignore compiled patterns in replace (…
meeseeksmachine Aug 17, 2020
66d08dc
Backport PR #35519: REF: StringArray._from_sequence, use less memory …
meeseeksmachine Aug 17, 2020
56e95ad
Backport PR #35750: Pass check_dtype to assert_extension_array_equal …
meeseeksmachine Aug 17, 2020
7a5d186
Backport PR #35543: REGR: Fix interpolation on empty dataframe (#35764)
meeseeksmachine Aug 17, 2020
4fc0330
Backport PR #35774: REGR: follow-up to return copy with df.interpolat…
meeseeksmachine Aug 18, 2020
92a6c3a
Backport PR #35787: DOC: clean v1.1.1 release notes (#35800)
meeseeksmachine Aug 19, 2020
827e606
Backport PR #35776: Changed 'int' type to 'integer' in to_numeric doc…
meeseeksmachine Aug 19, 2020
6d44a73
Backport PR #35809: CI: more xfail failing 32-bit tests (#35821)
meeseeksmachine Aug 20, 2020
311fcde
CI: test_chunks_have_consistent_numerical_type periodically fails on …
simonjayhawkins Aug 20, 2020
665e61b
Backport PR #35801: DOC: another pass of v1.1.1 release notes (#35822)
meeseeksmachine Aug 20, 2020
f2ca0a2
RLS: 1.1.1
Aug 20, 2020
39ec5ce
MAINT: Manual Backport PR #35825 on branch 1.1.x (#35835)
alimcmaster1 Aug 21, 2020
10c9c02
Backport PR #35825: DOC: Start 1.1.2 (#35834)
meeseeksmachine Aug 21, 2020
4ca2bbd
Backport PR #35757: CI: Unpin Pytest + Pytest Asyncio Min Version (#3…
meeseeksmachine Aug 21, 2020
4ed1492
Backport PR #35877: REGR: DatetimeIndex.intersection incorrectly rais…
meeseeksmachine Aug 25, 2020
54ea0cd
TST: Fix test_parquet failures for pyarrow 1.0 (#35814) (#35887)
jorisvandenbossche Aug 25, 2020
c9fb752
BUG: DataFrame.apply with result_type=reduce incorrect index (#35905)
simonjayhawkins Aug 26, 2020
f86b129
Backport PR #35712: PERF: RangeIndex.format performance (#35904)
simonjayhawkins Aug 26, 2020
d7a387b
"Backport PR #35838 on branch 1.1.x" (#35915)
dsaxton Aug 27, 2020
08a090e
Backport PR #35794: BUG: issubclass check with dtype instead of type,…
simonjayhawkins Aug 27, 2020
aa40717
Backport PR #36011: CI: suppress another setuptools warning (#36013)
meeseeksmachine Sep 1, 2020
9ae9673
Backport PR #35936: (REGR: Fix inplace updates on column to set corre…
simonjayhawkins Sep 1, 2020
1253599
CI: pin s3fs for Windows py37_np18 on 1.1.x (#36035)
simonjayhawkins Sep 1, 2020
9c38e49
Backport PR #35999: BUG: None in Float64Index raising TypeError, shou…
meeseeksmachine Sep 1, 2020
736550d
Backport PR #35938: REGR: Fix comparison broadcasting over array of I…
meeseeksmachine Sep 1, 2020
f9fed6a
CI: pin setuptools on 1.1.x (#36048)
simonjayhawkins Sep 1, 2020
9bc223e
Backport PR #35852: API: replace dropna=False option with na_sentinel…
meeseeksmachine Sep 2, 2020
6c2a9d8
Backport PR #36051: BUG: frame._item_cache not cleared when Series is…
meeseeksmachine Sep 2, 2020
59a4f78
Backport PR #36086: DOC: minor fixes to whatsnew\v1.1.2.rst (#36095)
meeseeksmachine Sep 3, 2020
635361b
DOC: sync doc/source/whatsnew/v1.1.2.rst on 1.1.x (#36112)
simonjayhawkins Sep 4, 2020
8d057b2
Backport PR #36061: BUG: groupby and agg on read-only array gives Val…
meeseeksmachine Sep 4, 2020
820218d
Backport PR #36118: REGR: ensure closed attribute of IntervalIndex is…
meeseeksmachine Sep 4, 2020
45bf911
Backport PR #36050: BUG: incorrect year returned in isocalendar for c…
meeseeksmachine Sep 4, 2020
869e15a
Backport PR #36114: REGR: fix consolidation/cache issue with take ope…
meeseeksmachine Sep 5, 2020
169a692
Backport PR #35914: Make MultiIndex.get_loc raise for unhashable type…
meeseeksmachine Sep 6, 2020
a61f1ad
Backport PR #36054: BUG: Don't raise when constructing Series from or…
meeseeksmachine Sep 6, 2020
fdfe66c
CLN: backport mpl warning fix to 1.1.2 (#36155)
fangchenli Sep 6, 2020
ce2f879
Backport PR #35979: BUG: Respect errors="ignore" during extension ast…
meeseeksmachine Sep 6, 2020
d0a39d1
Backport PR #36115: REGR: append tz-aware DataFrame with tz-naive val…
meeseeksmachine Sep 6, 2020
a8ef12b
BUG GH31355 fixed by adding more relevant error message
Sep 6, 2020
b3dca88
formatted code
Sep 6, 2020
a715964
Backport PR #35882: BUG: item_cache invalidation in get_numeric_data …
meeseeksmachine Sep 7, 2020
89057f4
Backport PR #36191: TST: update test_series_factorize_na_sentinel_non…
meeseeksmachine Sep 7, 2020
bb5cf8e
BUG: shows correct package name when import_optional_dependency is ca…
simonjayhawkins Sep 7, 2020
c899247
Backport PR #36152: Fix compressed multiindex for output of groupby.r…
meeseeksmachine Sep 7, 2020
9bb2034
Backport PR #36208: BUG: GroupbyRolling with an empty frame (#36213)
meeseeksmachine Sep 8, 2020
d8da320
Backport PR #36205: DOC: doc fix (#36215)
meeseeksmachine Sep 8, 2020
e6fd1b6
Backport PR #36182: DOC: release date for 1.1.2 (#36217)
meeseeksmachine Sep 8, 2020
2afdb3d
TST: skip test_groupby_rolling_index_changed on 32bit (#36220)
simonjayhawkins Sep 8, 2020
ee6e91c
Backport PR #36141: BUG: copying series into empty dataframe does not…
meeseeksmachine Sep 8, 2020
2a7d332
RLS: 1.1.2
Sep 8, 2020
f757f62
Backport PR #36183: DOC: Start 1.1.3 (#36242)
meeseeksmachine Sep 9, 2020
7a66dbb
alter position of error message being raised
Sep 13, 2020
76066ec
alter position of error message being raised
Sep 13, 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
4 changes: 4 additions & 0 deletions ci/code_checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,11 @@ if [[ -z "$CHECK" || "$CHECK" == "lint" ]]; then

# Imports - Check formatting using isort see setup.cfg for settings
MSG='Check import format using isort' ; echo $MSG
<<<<<<< HEAD
ISORT_CMD="isort --quiet --check-only pandas asv_bench scripts"
=======
ISORT_CMD="isort --quiet --check-only pandas asv_bench scripts web"
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683
if [[ "$GITHUB_ACTIONS" == "true" ]]; then
eval $ISORT_CMD | awk '{print "##[error]" $0}'; RET=$(($RET + ${PIPESTATUS[0]}))
else
Expand Down
399 changes: 399 additions & 0 deletions ci/code_checks.sh.orig

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions ci/deps/azure-37-32bit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,8 @@ dependencies:
- pip
- pip:
- cython>=0.29.16
<<<<<<< HEAD:ci/deps/azure-36-32bit.yaml
=======
- numpy>=1.16.5
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683:ci/deps/azure-37-32bit.yaml
- pytest>=5.0.1
29 changes: 29 additions & 0 deletions ci/deps/azure-37-32bit_BACKUP_47740.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: pandas-dev
channels:
- defaults
- conda-forge
dependencies:
- python=3.7.*

# tools
### Cython 0.29.16 and pytest 5.0.1 for 32 bits are not available with conda, installing below with pip instead
- pytest-xdist>=1.21
- hypothesis>=3.58.0
- pytest-azurepipelines

# pandas dependencies
- attrs=19.1.0
- gcc_linux-32
- gxx_linux-32
- python-dateutil
- pytz=2017.3

# see comment above
- pip
- pip:
- cython>=0.29.16
<<<<<<< HEAD:ci/deps/azure-36-32bit.yaml
=======
- numpy>=1.16.5
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683:ci/deps/azure-37-32bit.yaml
- pytest>=5.0.1
26 changes: 26 additions & 0 deletions ci/deps/azure-37-32bit_BASE_47740.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: pandas-dev
channels:
- defaults
- conda-forge
dependencies:
- python=3.6.*

# tools
### Cython 0.29.13 and pytest 5.0.1 for 32 bits are not available with conda, installing below with pip instead
- pytest-xdist>=1.21
- hypothesis>=3.58.0
- pytest-azurepipelines

# pandas dependencies
- attrs=19.1.0
- gcc_linux-32
- gxx_linux-32
- numpy=1.14.*
- python-dateutil
- pytz=2017.2

# see comment above
- pip
- pip:
- cython>=0.29.16
- pytest>=5.0.1,<6.0.0rc0
26 changes: 26 additions & 0 deletions ci/deps/azure-37-32bit_LOCAL_47740.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: pandas-dev
channels:
- defaults
- conda-forge
dependencies:
- python=3.6.*

# tools
### Cython 0.29.13 and pytest 5.0.1 for 32 bits are not available with conda, installing below with pip instead
- pytest-xdist>=1.21
- hypothesis>=3.58.0
- pytest-azurepipelines

# pandas dependencies
- attrs=19.1.0
- gcc_linux-32
- gxx_linux-32
- numpy=1.14.*
- python-dateutil
- pytz=2017.2

# see comment above
- pip
- pip:
- cython>=0.29.16
- pytest>=5.0.1
26 changes: 26 additions & 0 deletions ci/deps/azure-37-32bit_REMOTE_47740.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: pandas-dev
channels:
- defaults
- conda-forge
dependencies:
- python=3.7.*

# tools
### Cython 0.29.16 and pytest 5.0.1 for 32 bits are not available with conda, installing below with pip instead
- pytest-xdist>=1.21
- hypothesis>=3.58.0
- pytest-azurepipelines

# pandas dependencies
- attrs=19.1.0
- gcc_linux-32
- gxx_linux-32
- python-dateutil
- pytz=2017.3

# see comment above
- pip
- pip:
- cython>=0.29.16
- numpy>=1.16.5
- pytest>=5.0.1
8 changes: 8 additions & 0 deletions ci/deps/azure-windows-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ dependencies:
# tools
- cython>=0.29.16
- pytest>=5.0.1
<<<<<<< HEAD
- pytest-xdist>=1.21,<2.0.0 # GH 35737
=======
- pytest-xdist>=1.21
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683
- hypothesis>=3.58.0
- pytest-azurepipelines

Expand All @@ -30,7 +34,11 @@ dependencies:
- pytables
- python-dateutil
- pytz
<<<<<<< HEAD
- s3fs>=0.4.0,<0.5.0
=======
- s3fs>=0.4.2
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683
- scipy
- sqlalchemy
- xlrd
Expand Down
4 changes: 4 additions & 0 deletions ci/deps/azure-windows-38.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ dependencies:
# tools
- cython>=0.29.16
- pytest>=5.0.1
<<<<<<< HEAD:ci/deps/azure-windows-36.yaml
- pytest-xdist>=1.21,<2.0.0 # GH 35737
=======
- pytest-xdist>=1.21
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683:ci/deps/azure-windows-38.yaml
- hypothesis>=3.58.0
- pytest-azurepipelines

Expand Down
5 changes: 5 additions & 0 deletions ci/deps/travis-37-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,14 @@ dependencies:
- numpy
- openpyxl
- pandas-gbq=0.12.0
<<<<<<< HEAD:ci/deps/travis-36-locale.yaml
- psycopg2=2.6.2
- pyarrow>=0.13.0 # GH #35813
=======
- pyarrow>=0.17
- psycopg2=2.7
- pyarrow>=0.15.0 # GH #35813
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683:ci/deps/travis-37-locale.yaml
- pymysql=0.7.11
- pytables
- python-dateutil
Expand Down
2 changes: 1 addition & 1 deletion ci/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ python setup.py build_ext -q -i -j2
# - py35_compat
# - py36_32bit
echo "[Updating pip]"
python -m pip install --no-deps -U pip wheel setuptools
python -m pip install --no-deps -U pip wheel "setuptools<50.0.0"

echo "[Install pandas]"
python -m pip install --no-build-isolation -e .
Expand Down
4 changes: 4 additions & 0 deletions doc/source/whatsnew/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ Version 1.1
.. toctree::
:maxdepth: 2

<<<<<<< HEAD
v1.1.3
=======
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683
v1.1.2
v1.1.1
v1.1.0
Expand Down
36 changes: 36 additions & 0 deletions doc/source/whatsnew/v1.1.2.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
.. _whatsnew_112:

<<<<<<< HEAD
What's new in 1.1.2 (September 8, 2020)
---------------------------------------
=======
What's new in 1.1.2 (??)
------------------------
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683

These are the changes in pandas 1.1.2. See :ref:`release` for a full changelog
including other versions of pandas.
Expand All @@ -16,12 +21,23 @@ Fixed regressions
~~~~~~~~~~~~~~~~~
- Regression in :meth:`DatetimeIndex.intersection` incorrectly raising ``AssertionError`` when intersecting against a list (:issue:`35876`)
- Fix regression in updating a column inplace (e.g. using ``df['col'].fillna(.., inplace=True)``) (:issue:`35731`)
<<<<<<< HEAD
- Fix regression in :meth:`DataFrame.append` mixing tz-aware and tz-naive datetime columns (:issue:`35460`)
- Performance regression for :meth:`RangeIndex.format` (:issue:`35712`)
- Regression where :meth:`MultiIndex.get_loc` would return a slice spanning the full index when passed an empty list (:issue:`35878`)
=======
- Performance regression for :meth:`RangeIndex.format` (:issue:`35712`)
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683
- Fix regression in invalid cache after an indexing operation; this can manifest when setting which does not update the data (:issue:`35521`)
- Regression in :meth:`DataFrame.replace` where a ``TypeError`` would be raised when attempting to replace elements of type :class:`Interval` (:issue:`35931`)
- Fix regression in pickle roundtrip of the ``closed`` attribute of :class:`IntervalIndex` (:issue:`35658`)
- Fixed regression in :meth:`DataFrameGroupBy.agg` where a ``ValueError: buffer source array is read-only`` would be raised when the underlying array is read-only (:issue:`36014`)
<<<<<<< HEAD
- Fixed regression in :meth:`Series.groupby.rolling` number of levels of :class:`MultiIndex` in input was compressed to one (:issue:`36018`)
- Fixed regression in :class:`DataFrameGroupBy` on an empty :class:`DataFrame` (:issue:`36197`)
=======
-
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683

.. ---------------------------------------------------------------------------

Expand All @@ -32,10 +48,22 @@ Bug fixes
- Bug in :meth:`DataFrame.eval` with ``object`` dtype column binary operations (:issue:`35794`)
- Bug in :class:`Series` constructor raising a ``TypeError`` when constructing sparse datetime64 dtypes (:issue:`35762`)
- Bug in :meth:`DataFrame.apply` with ``result_type="reduce"`` returning with incorrect index (:issue:`35683`)
<<<<<<< HEAD
- Bug in :meth:`Series.astype` and :meth:`DataFrame.astype` not respecting the ``errors`` argument when set to ``"ignore"`` for extension dtypes (:issue:`35471`)
- Bug in :meth:`DateTimeIndex.format` and :meth:`PeriodIndex.format` with ``name=True`` setting the first item to ``"None"`` where it should be ``""`` (:issue:`35712`)
- Bug in :meth:`Float64Index.__contains__` incorrectly raising ``TypeError`` instead of returning ``False`` (:issue:`35788`)
- Bug in :class:`Series` constructor incorrectly raising a ``TypeError`` when passed an ordered set (:issue:`36044`)
- Bug in :meth:`Series.dt.isocalendar` and :meth:`DatetimeIndex.isocalendar` that returned incorrect year for certain dates (:issue:`36032`)
- Bug in :class:`DataFrame` indexing returning an incorrect :class:`Series` in some cases when the series has been altered and a cache not invalidated (:issue:`33675`)
- Bug in :meth:`DataFrame.corr` causing subsequent indexing lookups to be incorrect (:issue:`35882`)
- Bug in :meth:`import_optional_dependency` returning incorrect package names in cases where package name is different from import name (:issue:`35948`)
- Bug when setting empty :class:`DataFrame` column to a :class:`Series` in preserving name of index in frame (:issue:`31368`)
=======
- Bug in :meth:`DateTimeIndex.format` and :meth:`PeriodIndex.format` with ``name=True`` setting the first item to ``"None"`` where it should be ``""`` (:issue:`35712`)
- Bug in :meth:`Float64Index.__contains__` incorrectly raising ``TypeError`` instead of returning ``False`` (:issue:`35788`)
- Bug in :meth:`Series.dt.isocalendar` and :meth:`DatetimeIndex.isocalendar` that returned incorrect year for certain dates (:issue:`36032`)
- Bug in :class:`DataFrame` indexing returning an incorrect :class:`Series` in some cases when the series has been altered and a cache not invalidated (:issue:`33675`)
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683

.. ---------------------------------------------------------------------------

Expand All @@ -44,6 +72,10 @@ Bug fixes
Other
~~~~~
- :meth:`factorize` now supports ``na_sentinel=None`` to include NaN in the uniques of the values and remove ``dropna`` keyword which was unintentionally exposed to public facing API in 1.1 version from :meth:`factorize` (:issue:`35667`)
<<<<<<< HEAD
- :meth:`DataFrame.plot` and :meth:`Series.plot` raise ``UserWarning`` about usage of ``FixedFormatter`` and ``FixedLocator`` (:issue:`35684` and :issue:`35945`)
=======
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683

.. ---------------------------------------------------------------------------

Expand All @@ -52,4 +84,8 @@ Other
Contributors
~~~~~~~~~~~~

<<<<<<< HEAD
.. contributors:: v1.1.1..v1.1.2
=======
.. contributors:: v1.1.1..v1.1.2|HEAD
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683
42 changes: 42 additions & 0 deletions doc/source/whatsnew/v1.1.3.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
.. _whatsnew_113:

What's new in 1.1.3 (??)
------------------------

These are the changes in pandas 1.1.3. See :ref:`release` for a full changelog
including other versions of pandas.

{{ header }}

.. ---------------------------------------------------------------------------

.. _whatsnew_113.regressions:

Fixed regressions
~~~~~~~~~~~~~~~~~
-

.. ---------------------------------------------------------------------------

.. _whatsnew_113.bug_fixes:

Bug fixes
~~~~~~~~~
-

.. ---------------------------------------------------------------------------

.. _whatsnew_113.other:

Other
~~~~~
-

.. ---------------------------------------------------------------------------

.. _whatsnew_113.contributors:

Contributors
~~~~~~~~~~~~

.. contributors:: v1.1.2..v1.1.3|HEAD
7 changes: 7 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ dependencies:
- flake8-comprehensions>=3.1.0 # used by flake8, linting of unnecessary comprehensions
- flake8-rst>=0.6.0,<=0.7.0 # linting of code blocks in rst files
- isort>=5.2.1 # check that imports are in the right order
<<<<<<< HEAD
- mypy=0.730
=======
- mypy=0.782
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683
- pycodestyle # used by flake8

# documentation
Expand Down Expand Up @@ -51,7 +55,10 @@ dependencies:
- botocore>=1.11
- hypothesis>=3.82
- moto # mock S3
<<<<<<< HEAD
=======
- flask
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683
- pytest>=5.0.1
- pytest-cov
- pytest-xdist>=1.21
Expand Down
7 changes: 7 additions & 0 deletions pandas/_libs/missing.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,17 @@ from pandas._libs.tslibs.nattype cimport (
is_null_datetimelike,
)
from pandas._libs.tslibs.np_datetime cimport get_datetime64_value, get_timedelta64_value
<<<<<<< HEAD

from pandas._libs.ops_dispatch import maybe_dispatch_ufunc_to_dunder_op
from pandas.compat import is_platform_32bit

=======

from pandas._libs.ops_dispatch import maybe_dispatch_ufunc_to_dunder_op
from pandas.compat import IS64

>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683
cdef:
float64_t INF = <float64_t>np.inf
float64_t NEGINF = -INF
Expand Down
4 changes: 4 additions & 0 deletions pandas/_testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -2897,7 +2897,11 @@ def convert_rows_list_to_csv_str(rows_list: List[str]):
return expected


<<<<<<< HEAD
def external_error_raised(expected_exception: Type[Exception],) -> ContextManager:
=======
def external_error_raised(expected_exception: Type[Exception]) -> ContextManager:
>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683
"""
Helper function to mark pytest.raises that have an external error message.

Expand Down
Loading