Merge branch 'main' into do-not-error-on-other-dbapi2-connections

Author: jrandall

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-- [ ] closes #xxxx
-- [ ] tests added / passed
-- [ ] Ensure all linting tests pass, see [here](https://pandas.pydata.org/pandas-docs/dev/development/contributing_codebase.html#pre-commit) for how to run them
-- [ ] whatsnew entry
+- [ ] closes #xxxx (Replace xxxx with the Github issue number)
+- [ ] [Tests added and passed](https://pandas.pydata.org/pandas-docs/dev/development/contributing_codebase.html#writing-tests) if fixing a bug or adding a new feature
+- [ ] All [code checks passed](https://pandas.pydata.org/pandas-docs/dev/development/contributing_codebase.html#pre-commit).
+- [ ] Added an entry in the latest `doc/source/whatsnew/vX.X.X.rst` file if fixing a bug or adding a new feature.

asv_bench/benchmarks/groupby.py

@@ -741,6 +741,12 @@ def setup(self):
             index=np.random.choice(range(10), n),
         )
 
+        n = 1_000_000
+        self.df_tall = DataFrame(
+            np.random.randn(n, 3),
+            index=np.random.randint(0, 5, n),
+        )
+
         n = 20000
         self.df1 = DataFrame(
             np.random.randint(1, n, (n, 3)), columns=["jim", "joe", "jolie"]
@@ -760,6 +766,9 @@ def time_transform_lambda_max(self):
     def time_transform_ufunc_max(self):
         self.df.groupby(level="lev1").transform(np.max)
 
+    def time_transform_lambda_max_tall(self):
+        self.df_tall.groupby(level=0).transform(lambda x: np.max(x, axis=0))
+
     def time_transform_lambda_max_wide(self):
         self.df_wide.groupby(level=0).transform(lambda x: np.max(x, axis=0))
 

ci/deps/actions-38-downstream_compat.yaml

@@ -4,52 +4,57 @@ channels:
   - conda-forge
 dependencies:
   - python=3.8
-  - pip
 
   # test dependencies
-  - cython>=0.29.24
+  - cython=0.29.24
   - pytest>=6.0
+  - pytest-cov
   - pytest-xdist>=1.31
   - hypothesis>=5.5.3
-  - pytest-cov>=2.10.1  # this is only needed in the coverage build, ref: GH 35737
-  - nomkl
+  - psutil
 
   # required dependencies
-  - numpy
   - python-dateutil
+  - numpy
   - pytz
 
   # optional dependencies
   - beautifulsoup4
   - blosc
-  - fastparquet>=0.4.0
-  - fsspec>=0.7.4
-  - gcsfs
+  - bottleneck
+  - fastparquet
+  - fsspec
   - html5lib
+  - gcsfs
   - jinja2
   - lxml
   - matplotlib
+  - numba
   - numexpr
-  - odfpy
   - openpyxl
+  - odfpy
   - pandas-gbq
   - psycopg2
-  - pyarrow>=1.0.1
   - pymysql
   - pytables
+  - pyarrow
+  - pyreadstat
   - pyxlsb
-  - s3fs>=0.4.0
+  - s3fs
   - scipy
   - sqlalchemy
+  - tabulate
   - xarray
   - xlrd
   - xlsxwriter
   - xlwt
+  - zstandard
 
   # downstream packages
-  - aiobotocore<2.0.0  # GH#44311 pinned to fix docbuild
+  - aiobotocore
   - boto3
-  - botocore>=1.11
+  - botocore
+  - cftime
   - dask
   - ipython
   - geopandas
@@ -62,5 +67,4 @@ dependencies:
   - pandas-datareader
   - pyyaml
   - py
-  - pip:
-    - torch
+  - pytorch

ci/deps/actions-38.yaml

@@ -36,7 +36,7 @@ dependencies:
   - psycopg2
   - pymysql
   - pytables
-  - pyarrow=3
+  - pyarrow
   - pyreadstat
   - pyxlsb
   - s3fs

ci/deps/actions-39.yaml

@@ -36,7 +36,7 @@ dependencies:
   - psycopg2
   - pymysql
   - pytables
-  - pyarrow=5
+  - pyarrow
   - pyreadstat
   - pyxlsb
   - s3fs

doc/source/development/code_style.rst

@@ -9,61 +9,12 @@ pandas code style guide
 .. contents:: Table of contents:
    :local:
 
-pandas follows the `PEP8 <https://www.python.org/dev/peps/pep-0008/>`_
-standard and uses `Black <https://black.readthedocs.io/en/stable/>`_
-and `Flake8 <https://flake8.pycqa.org/en/latest/>`_ to ensure a
-consistent code format throughout the project. We encourage you to use
-:ref:`pre-commit <contributing.pre-commit>` to automatically run ``black``,
-``flake8``, ``isort``, and related code checks when you make a git commit.
-
 Patterns
 ========
 
 We use a ``flake8`` plugin, `pandas-dev-flaker <https://github.com/pandas-dev/pandas-dev-flaker>`_, to
 check our codebase for unwanted patterns. See its ``README`` for the up-to-date list of rules we enforce.
 
-Testing
-=======
-
-Failing tests
---------------
-
-See https://docs.pytest.org/en/latest/how-to/skipping.html for background.
-
-Do not use ``pytest.xfail``
----------------------------
-
-Do not use this method. It has the same behavior as ``pytest.skip``, namely
-it immediately stops the test and does not check if the test will fail. If
-this is the behavior you desire, use ``pytest.skip`` instead.
-
-Using ``pytest.mark.xfail``
----------------------------
-
-Use this method if a test is known to fail but the manner in which it fails
-is not meant to be captured. It is common to use this method for a test that
-exhibits buggy behavior or a non-implemented feature. If
-the failing test has flaky behavior, use the argument ``strict=False``. This
-will make it so pytest does not fail if the test happens to pass.
-
-Prefer the decorator ``@pytest.mark.xfail`` and the argument ``pytest.param``
-over usage within a test so that the test is appropriately marked during the
-collection phase of pytest. For xfailing a test that involves multiple
-parameters, a fixture, or a combination of these, it is only possible to
-xfail during the testing phase. To do so, use the ``request`` fixture:
-
-.. code-block:: python
-
-    import pytest
-
-    def test_xfail(request):
-        mark = pytest.mark.xfail(raises=TypeError, reason="Indicate why here")
-        request.node.add_marker(mark)
-
-xfail is not to be used for tests involving failure due to invalid user arguments.
-For these tests, we need to verify the correct exception type and error message
-is being raised, using ``pytest.raises`` instead.
-
 Miscellaneous
 =============