diff --git a/.github/workflows/package-checks.yml b/.github/workflows/package-checks.yml index d59ddf272f705..28c56ec7ff03b 100644 --- a/.github/workflows/package-checks.yml +++ b/.github/workflows/package-checks.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - extra: ["test", "performance", "computation", "fss", "aws", "gcp", "excel", "parquet", "feather", "hdf5", "spss", "postgresql", "mysql", "sql-other", "html", "xml", "plot", "output-formatting", "clipboard", "compression", "consortium-standard", "all"] + extra: ["test", "performance", "computation", "fss", "aws", "gcp", "excel", "parquet", "feather", "hdf5", "spss", "postgresql", "mysql", "sql-other", "html", "xml", "plot", "output-formatting", "clipboard", "compression", "all"] fail-fast: false name: Install Extras - ${{ matrix.extra }} concurrency: diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index 8751cfd52f97d..efd790d77afbb 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -74,5 +74,4 @@ dependencies: - pip: - adbc-driver-postgresql>=0.8.0 - adbc-driver-sqlite>=0.8.0 - - dataframe-api-compat>=0.1.7 - tzdata>=2022.7 diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml index d59da897c0d33..94cb21d1621b6 100644 --- a/ci/deps/actions-39-minimum_versions.yaml +++ b/ci/deps/actions-39-minimum_versions.yaml @@ -62,5 +62,4 @@ dependencies: - pip: - adbc-driver-postgresql==0.8.0 - adbc-driver-sqlite==0.8.0 - - dataframe-api-compat==0.1.7 - tzdata==2022.7 diff --git a/doc/source/getting_started/install.rst b/doc/source/getting_started/install.rst index 33ce6f0218b98..77e273d8c81fe 100644 --- a/doc/source/getting_started/install.rst +++ b/doc/source/getting_started/install.rst @@ -417,14 +417,3 @@ Dependency Minimum Version pip extra Notes ========================= ================== =============== ============================================================= Zstandard 0.19.0 compression Zstandard compression ========================= ================== =============== ============================================================= - -Consortium Standard -^^^^^^^^^^^^^^^^^^^ - -Installable with ``pip install "pandas[consortium-standard]"`` - -========================= ================== =================== ============================================================= -Dependency Minimum Version pip extra Notes -========================= ================== =================== ============================================================= -dataframe-api-compat 0.1.7 consortium-standard Consortium Standard-compatible implementation based on pandas -========================= ================== =================== ============================================================= diff --git a/environment.yml b/environment.yml index 36d1bf27a4cd2..3528f12c66a8b 100644 --- a/environment.yml +++ b/environment.yml @@ -117,6 +117,5 @@ dependencies: - pip: - adbc-driver-postgresql>=0.8.0 - adbc-driver-sqlite>=0.8.0 - - dataframe-api-compat>=0.1.7 - typing_extensions; python_version<"3.11" - tzdata>=2022.7 diff --git a/pandas/compat/_optional.py b/pandas/compat/_optional.py index 3a438b76b1263..ddd9b591d3e83 100644 --- a/pandas/compat/_optional.py +++ b/pandas/compat/_optional.py @@ -24,7 +24,6 @@ "bs4": "4.11.2", "blosc": "1.21.3", "bottleneck": "1.3.6", - "dataframe-api-compat": "0.1.7", "fastparquet": "2023.04.0", "fsspec": "2022.11.0", "html5lib": "1.1", diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 6142e67ec1316..57f2cdef5457a 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -941,21 +941,6 @@ def __dataframe__( return PandasDataFrameXchg(self, allow_copy=allow_copy) - def __dataframe_consortium_standard__( - self, *, api_version: str | None = None - ) -> Any: - """ - Provide entry point to the Consortium DataFrame Standard API. - - This is developed and maintained outside of pandas. - Please report any issues to https://github.com/data-apis/dataframe-api-compat. - """ - dataframe_api_compat = import_optional_dependency("dataframe_api_compat") - convert_to_standard_compliant_dataframe = ( - dataframe_api_compat.pandas_standard.convert_to_standard_compliant_dataframe - ) - return convert_to_standard_compliant_dataframe(self, api_version=api_version) - def __arrow_c_stream__(self, requested_schema=None): """ Export the pandas DataFrame as an Arrow C stream PyCapsule. diff --git a/pandas/core/series.py b/pandas/core/series.py index ed82a62d0f345..5956fa59528a7 100644 --- a/pandas/core/series.py +++ b/pandas/core/series.py @@ -33,7 +33,6 @@ from pandas._libs.lib import is_range_indexer from pandas.compat import PYPY from pandas.compat._constants import REF_COUNT -from pandas.compat._optional import import_optional_dependency from pandas.compat.numpy import function as nv from pandas.errors import ( ChainedAssignmentError, @@ -846,22 +845,6 @@ def __array__(self, dtype: npt.DTypeLike | None = None) -> np.ndarray: # ---------------------------------------------------------------------- - def __column_consortium_standard__(self, *, api_version: str | None = None) -> Any: - """ - Provide entry point to the Consortium DataFrame Standard API. - - This is developed and maintained outside of pandas. - Please report any issues to https://github.com/data-apis/dataframe-api-compat. - """ - dataframe_api_compat = import_optional_dependency("dataframe_api_compat") - return ( - dataframe_api_compat.pandas_standard.convert_to_standard_compliant_column( - self, api_version=api_version - ) - ) - - # ---------------------------------------------------------------------- - # indexers @property def axes(self) -> list[Index]: diff --git a/pandas/tests/test_downstream.py b/pandas/tests/test_downstream.py index 7186056f90299..824e550e0f03b 100644 --- a/pandas/tests/test_downstream.py +++ b/pandas/tests/test_downstream.py @@ -306,25 +306,6 @@ def test_from_obscure_array(dtype, box): tm.assert_index_equal(result, expected) -def test_dataframe_consortium() -> None: - """ - Test some basic methods of the dataframe consortium standard. - - Full testing is done at https://github.com/data-apis/dataframe-api-compat, - this is just to check that the entry point works as expected. - """ - pytest.importorskip("dataframe_api_compat") - df_pd = DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]}) - df = df_pd.__dataframe_consortium_standard__() - result_1 = df.get_column_names() - expected_1 = ["a", "b"] - assert result_1 == expected_1 - - ser = Series([1, 2, 3], name="a") - col = ser.__column_consortium_standard__() - assert col.name == "a" - - def test_xarray_coerce_unit(): # GH44053 xr = pytest.importorskip("xarray") diff --git a/pyproject.toml b/pyproject.toml index 93b4491449e8d..5d1f56ee3597e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -84,14 +84,12 @@ plot = ['matplotlib>=3.6.3'] output-formatting = ['jinja2>=3.1.2', 'tabulate>=0.9.0'] clipboard = ['PyQt5>=5.15.9', 'qtpy>=2.3.0'] compression = ['zstandard>=0.19.0'] -consortium-standard = ['dataframe-api-compat>=0.1.7'] all = ['adbc-driver-postgresql>=0.8.0', 'adbc-driver-sqlite>=0.8.0', 'beautifulsoup4>=4.11.2', # blosc only available on conda (https://github.com/Blosc/python-blosc/issues/297) #'blosc>=1.21.3', 'bottleneck>=1.3.6', - 'dataframe-api-compat>=0.1.7', 'fastparquet>=2023.04.0', 'fsspec>=2022.11.0', 'gcsfs>=2022.11.0', diff --git a/requirements-dev.txt b/requirements-dev.txt index 96c497d35b958..40c7403cb88e8 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -85,6 +85,5 @@ requests pygments adbc-driver-postgresql>=0.8.0 adbc-driver-sqlite>=0.8.0 -dataframe-api-compat>=0.1.7 typing_extensions; python_version<"3.11" tzdata>=2022.7