Merge branch 'pandas-dev:main' into main

zain581 · Jan 2, 2024 · 5041543 · 5041543
2 parents 2e6da9e + 86ad444
commit 5041543
Show file tree

Hide file tree

Showing 181 changed files with 1,500 additions and 1,315 deletions.
diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - main
-      - 2.1.x
+      - 2.2.x
   pull_request:
     branches:
       - main
-      - 2.1.x
+      - 2.2.x
 
 env:
   ENV_FILE: environment.yml

diff --git a/.github/workflows/deprecation-tracking-bot.yml b/.github/workflows/deprecation-tracking-bot.yml
@@ -19,7 +19,7 @@ jobs:
       issues: write
     runs-on: ubuntu-22.04
     env:
-      DEPRECATION_TRACKER_ISSUE: 50578
+      DEPRECATION_TRACKER_ISSUE: 56596
     steps:
     - uses: actions/github-script@v7
       id: update-deprecation-issue

diff --git a/.github/workflows/docbuild-and-upload.yml b/.github/workflows/docbuild-and-upload.yml
@@ -4,13 +4,13 @@ on:
   push:
     branches:
       - main
-      - 2.1.x
+      - 2.2.x
     tags:
       - '*'
   pull_request:
     branches:
       - main
-      - 2.1.x
+      - 2.2.x
 
 env:
   ENV_FILE: environment.yml

diff --git a/.github/workflows/package-checks.yml b/.github/workflows/package-checks.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - main
-      - 2.1.x
+      - 2.2.x
   pull_request:
     branches:
       - main
-      - 2.1.x
+      - 2.2.x
     types: [ labeled, opened, synchronize, reopened ]
 
 permissions:

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - main
-      - 2.1.x
+      - 2.2.x
   pull_request:
     branches:
       - main
-      - 2.1.x
+      - 2.2.x
     paths-ignore:
       - "doc/**"
       - "web/**"
@@ -92,7 +92,7 @@ jobs:
           - name: "Numpy Dev"
             env_file: actions-311-numpydev.yaml
             pattern: "not slow and not network and not single_cpu"
-            test_args: "-W error::FutureWarning"
+            test_args: "-W error::DeprecationWarning -W error::FutureWarning"
           - name: "Pyarrow Nightly"
             env_file: actions-311-pyarrownightly.yaml
             pattern: "not slow and not network and not single_cpu"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -32,6 +32,8 @@ repos:
         # TODO: remove autofixe-only rules when they are checked by ruff
         name: ruff-selected-autofixes
         alias: ruff-selected-autofixes
+        files: ^pandas
+        exclude: ^pandas/tests
         args: [--select, "ANN001,ANN2", --fix-only, --exit-non-zero-on-fix]
 -   repo: https://github.com/jendrikseipp/vulture
     rev: 'v2.10'
@@ -356,18 +358,6 @@ repos:
         files: ^pandas/
         exclude: ^(pandas/_libs/|pandas/tests/|pandas/errors/__init__.py$|pandas/_version.py)
         types: [python]
-    -   id: future-annotations
-        name: import annotations from __future__
-        entry: 'from __future__ import annotations'
-        language: pygrep
-        args: [--negate]
-        files: ^pandas/
-        types: [python]
-        exclude: |
-            (?x)
-            /(__init__\.py)|(api\.py)|(_version\.py)|(testing\.py)|(conftest\.py)$
-            |/tests/
-            |/_testing/
     -   id: check-test-naming
         name: check that test names start with 'test'
         entry: python -m scripts.check_test_naming

diff --git a/CITATION.cff b/CITATION.cff
@@ -3,12 +3,50 @@ title: 'pandas-dev/pandas: Pandas'
 message: 'If you use this software, please cite it as below.'
 authors:
   - name: "The pandas development team"
+    website: "https://pandas.pydata.org/about/team.html"
 abstract: "Pandas is a powerful data structures for data analysis, time series, and statistics."
+doi: 10.5281/zenodo.3509134
 license: BSD-3-Clause
 license-url: "https://github.com/pandas-dev/pandas/blob/main/LICENSE"
 repository-code: "https://github.com/pandas-dev/pandas"
 keywords:
   - python
   - data science
+  - flexible
+  - pandas
+  - alignment
+  - data analysis
 type: software
-url: "https://github.com/pandas-dev/pandas"
+url: "https://pandas.pydata.org/"
+references:
+  - type: article
+    authors:
+      - given-names: Wes
+        family-names: McKinney
+        affiliation: AQR Capital Management, LLC
+        email: wesmckinn@gmail.com
+    title: Data Structures for Statistical Computing in Python
+    doi: 10.25080/Majora-92bf1922-00a
+    license: CC-BY-3.0
+    start: 56
+    end: 61
+    year: 2010
+    collection-title: Proceedings of the 9th Python in Science Conference
+    collection-doi: 10.25080/Majora-92bf1922-012
+    collection-type: proceedings
+    editors:
+      - given-names: Stéfan
+        name-particle: van der
+        family-names: Walt
+      - given-names: Jarrod
+        family-names: Millman
+    conference:
+      name: 9th Python in Science Conference (SciPy 2010)
+      city: Austin, TX
+      country: US
+      date-start: "2010-06-28"
+      date-end: "2010-07-03"
+    keywords:
+      - data structure
+      - statistics
+      - R
diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml
@@ -20,7 +20,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # optional dependencies

diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml
@@ -21,7 +21,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # optional dependencies

diff --git a/ci/deps/actions-311-pyarrownightly.yaml b/ci/deps/actions-311-pyarrownightly.yaml
@@ -18,7 +18,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
   - pip
 

diff --git a/ci/deps/actions-311-sanitizers.yaml b/ci/deps/actions-311-sanitizers.yaml
@@ -22,7 +22,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # pandas dependencies

diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml
@@ -20,7 +20,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # optional dependencies

diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml
@@ -20,7 +20,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # optional dependencies

diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml
@@ -22,7 +22,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil=2.8.2
-  - numpy=1.22.4, <2
+  - numpy=1.22.4
   - pytz=2020.1
 
   # optional dependencies

diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml
@@ -20,7 +20,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # optional dependencies

diff --git a/ci/deps/actions-pypy-39.yaml b/ci/deps/actions-pypy-39.yaml
@@ -20,7 +20,7 @@ dependencies:
   - hypothesis>=6.46.1
 
   # required
-  - numpy<2
+  - numpy
   - python-dateutil
   - pytz
   - pip:

diff --git a/ci/deps/circle-310-arm64.yaml b/ci/deps/circle-310-arm64.yaml
@@ -20,7 +20,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # optional dependencies

diff --git a/doc/source/user_guide/copy_on_write.rst b/doc/source/user_guide/copy_on_write.rst
@@ -317,7 +317,7 @@ you are modifying one object inplace.
 .. ipython:: python
 
     df = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
-    df2 = df.reset_index()
+    df2 = df.reset_index(drop=True)
     df2.iloc[0, 0] = 100
 
 This creates two objects that share data and thus the setitem operation will trigger a
@@ -328,7 +328,7 @@ held by the object.
 .. ipython:: python
 
     df = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
-    df = df.reset_index()
+    df = df.reset_index(drop=True)
     df.iloc[0, 0] = 100
 
 No copy is necessary in this example.

diff --git a/doc/source/whatsnew/index.rst b/doc/source/whatsnew/index.rst
@@ -10,6 +10,15 @@ This is the list of changes to pandas between each release. For full details,
 see the `commit logs <https://github.com/pandas-dev/pandas/commits/>`_. For install and
 upgrade instructions, see :ref:`install`.
 
+Version 2.3
+-----------
+
+.. toctree::
+   :maxdepth: 2
+
+   v2.3.0
+
+
 Version 2.2
 -----------