pandas-dev · TAJD · Jul 29, 2020 · Jul 30, 2020 · Aug 1, 2020 · Aug 1, 2020
diff --git a/ci/code_checks.sh b/ci/code_checks.sh
@@ -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

diff --git a/ci/code_checks.sh.orig b/ci/code_checks.sh.orig
diff --git a/ci/deps/azure-37-32bit.yaml b/ci/deps/azure-37-32bit.yaml
@@ -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
diff --git a/ci/deps/azure-37-32bit_BACKUP_47740.yaml b/ci/deps/azure-37-32bit_BACKUP_47740.yaml
@@ -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
diff --git a/ci/deps/azure-37-32bit_BASE_47740.yaml b/ci/deps/azure-37-32bit_BASE_47740.yaml
@@ -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
diff --git a/ci/deps/azure-37-32bit_LOCAL_47740.yaml b/ci/deps/azure-37-32bit_LOCAL_47740.yaml
@@ -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
diff --git a/ci/deps/azure-37-32bit_REMOTE_47740.yaml b/ci/deps/azure-37-32bit_REMOTE_47740.yaml
@@ -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
diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml
@@ -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
 
@@ -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

diff --git a/ci/deps/azure-windows-38.yaml b/ci/deps/azure-windows-38.yaml
@@ -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
 

diff --git a/ci/deps/travis-37-locale.yaml b/ci/deps/travis-37-locale.yaml
@@ -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

diff --git a/ci/setup_env.sh b/ci/setup_env.sh
@@ -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 .

diff --git a/doc/source/whatsnew/index.rst b/doc/source/whatsnew/index.rst
@@ -24,6 +24,10 @@ Version 1.1
 .. toctree::
    :maxdepth: 2
 
+<<<<<<< HEAD
+   v1.1.3
+=======
+>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683
    v1.1.2
    v1.1.1
    v1.1.0

diff --git a/doc/source/whatsnew/v1.1.2.rst b/doc/source/whatsnew/v1.1.2.rst
@@ -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.
@@ -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
 
 .. ---------------------------------------------------------------------------
 
@@ -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
 
 .. ---------------------------------------------------------------------------
 
@@ -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
 
 .. ---------------------------------------------------------------------------
 
@@ -52,4 +84,8 @@ Other
 Contributors
 ~~~~~~~~~~~~
 
+<<<<<<< HEAD
+.. contributors:: v1.1.1..v1.1.2
+=======
 .. contributors:: v1.1.1..v1.1.2|HEAD
+>>>>>>> b3dca88d31d0f463932713bab92a0953f4adf683
diff --git a/doc/source/whatsnew/v1.1.3.rst b/doc/source/whatsnew/v1.1.3.rst
@@ -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
diff --git a/environment.yml b/environment.yml
@@ -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
@@ -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

diff --git a/pandas/_libs/missing.pyx b/pandas/_libs/missing.pyx
@@ -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

diff --git a/pandas/_testing.py b/pandas/_testing.py
@@ -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.