Merge remote-tracking branch 'upstream/main' into cow_inf_obj

Author: phofl

.github/workflows/32-bit-linux.yml

@@ -39,7 +39,7 @@ jobs:
           . ~/virtualenvs/pandas-dev/bin/activate && \
           python -m pip install --no-deps -U pip wheel 'setuptools<60.0.0' && \
           python -m pip install versioneer[toml] && \
-          python -m pip install cython numpy python-dateutil pytz pytest pytest-xdist pytest-asyncio>=0.17 hypothesis && \
+          python -m pip install cython numpy python-dateutil pytz pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.34.2 && \
           python setup.py build_ext -q -j1 && \
           python -m pip install --no-build-isolation --no-use-pep517 -e . && \
           python -m pip list && \

.github/workflows/python-dev.yml

@@ -73,10 +73,10 @@ jobs:
       run: |
         python --version
         python -m pip install --upgrade pip setuptools wheel
-        python -m pip install --extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
+        python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
         python -m pip install git+https://github.com/nedbat/coveragepy.git
         python -m pip install versioneer[toml]
-        python -m pip install python-dateutil pytz cython hypothesis==6.52.1 pytest>=6.2.5 pytest-xdist pytest-cov pytest-asyncio>=0.17
+        python -m pip install python-dateutil pytz cython hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-cov pytest-asyncio>=0.17
         python -m pip list
 
     # GH 47305: Parallel build can cause flaky ImportError from pandas/_libs/tslibs

.github/workflows/wheels.yml

@@ -168,7 +168,7 @@ jobs:
           # (1. Generate sdist 2. Build wheels from sdist)
           # This tests the sdists, and saves some build time
           python -m pip install dist/*.gz
-          pip install hypothesis==6.52.1 pytest>=6.2.5 pytest-xdist pytest-asyncio>=0.17
+          pip install hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17
           cd .. # Not a good idea to test within the src tree
           python -c "import pandas; print(pandas.__version__);
           pandas.test(extra_args=['-m not clipboard and not single_cpu', '--skip-slow', '--skip-network', '--skip-db', '-n=2']);

asv_bench/asv.conf.json

@@ -41,7 +41,7 @@
     // pip (with all the conda available packages installed first,
     // followed by the pip installed packages).
     "matrix": {
-        "numpy": ["1.23.5"],  // https://github.com/pandas-dev/pandas/pull/50356
+        "numpy": [],
         "Cython": ["0.29.32"],
         "matplotlib": [],
         "sqlalchemy": [],

ci/deps/actions-310-numpydev.yaml

@@ -1,17 +1,17 @@
 name: pandas-dev
 channels:
-  - defaults
+  - conda-forge
 dependencies:
   - python=3.10
 
   # build dependencies
   - versioneer[toml]
 
   # test dependencies
-  - pytest>=6.0
+  - pytest>=7.0.0
   - pytest-cov
-  - pytest-xdist>=1.31
-  - hypothesis>=5.5.3
+  - pytest-xdist>=2.2.0
+  - hypothesis>=6.34.2
   - pytest-asyncio>=0.17
 
   # pandas dependencies
@@ -22,5 +22,5 @@ dependencies:
     - "cython"
     - "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple"
     - "--pre"
-    - "numpy<1.24"
+    - "numpy"
     - "scipy"

ci/deps/actions-310.yaml

@@ -9,16 +9,16 @@ dependencies:
   - cython>=0.29.32
 
   # test dependencies
-  - pytest>=6.0
+  - pytest>=7.0.0
   - pytest-cov
-  - pytest-xdist>=1.31
+  - pytest-xdist>=2.2.0
   - psutil
   - pytest-asyncio>=0.17
   - boto3
 
   # required dependencies
   - python-dateutil
-  - numpy<1.24
+  - numpy
   - pytz
 
   # optional dependencies

ci/deps/actions-38-downstream_compat.yaml

@@ -10,16 +10,16 @@ dependencies:
   - cython>=0.29.32
 
   # test dependencies
-  - pytest>=6.0
+  - pytest>=7.0.0
   - pytest-cov
-  - pytest-xdist>=1.31
+  - pytest-xdist>=2.2.0
   - psutil
   - pytest-asyncio>=0.17
   - boto3
 
   # required dependencies
   - python-dateutil
-  - numpy<1.24
+  - numpy
   - pytz
 
   # optional dependencies

ci/deps/actions-38-minimum_versions.yaml

@@ -11,9 +11,9 @@ dependencies:
   - cython>=0.29.32
 
   # test dependencies
-  - pytest>=6.0
+  - pytest>=7.0.0
   - pytest-cov
-  - pytest-xdist>=1.31
+  - pytest-xdist>=2.2.0
   - psutil
   - pytest-asyncio>=0.17
   - boto3
@@ -31,7 +31,7 @@ dependencies:
   - fastparquet=0.6.3
   - fsspec=2021.07.0
   - html5lib=1.1
-  - hypothesis=6.13.0
+  - hypothesis=6.34.2
   - gcsfs=2021.07.0
   - jinja2=3.0.0
   - lxml=4.6.3

ci/deps/actions-38.yaml

@@ -9,16 +9,16 @@ dependencies:
   - cython>=0.29.32
 
   # test dependencies
-  - pytest>=6.0
+  - pytest>=7.0.0
   - pytest-cov
-  - pytest-xdist>=1.31
+  - pytest-xdist>=2.2.0
   - psutil
   - pytest-asyncio>=0.17
   - boto3
 
   # required dependencies
   - python-dateutil
-  - numpy<1.24
+  - numpy
   - pytz
 
   # optional dependencies

ci/deps/actions-39.yaml

@@ -9,16 +9,16 @@ dependencies:
   - cython>=0.29.32
 
   # test dependencies
-  - pytest>=6.0
+  - pytest>=7.0.0
   - pytest-cov
-  - pytest-xdist>=1.31
+  - pytest-xdist>=2.2.0
   - psutil
   - pytest-asyncio>=0.17
   - boto3
 
   # required dependencies
   - python-dateutil
-  - numpy<1.24
+  - numpy
   - pytz
 
   # optional dependencies