diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index d908a68a8be4a..b501c2ea394bd 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -75,11 +75,6 @@ jobs: env_file: actions-311.yaml pandas_future_infer_string: "1" platform: ubuntu-24.04 - - name: "Pypy" - env_file: actions-pypy-39.yaml - pattern: "not slow and not network and not single_cpu" - test_args: "--max-worker-restart 0" - platform: ubuntu-24.04 - name: "Numpy Dev" env_file: actions-311-numpydev.yaml pattern: "not slow and not network and not single_cpu" @@ -169,12 +164,9 @@ jobs: with: # xref https://github.com/cython/cython/issues/6870 werror: ${{ matrix.name != 'Freethreading' }} - # TODO: Re-enable once Pypy has Pypy 3.10 on conda-forge - if: ${{ matrix.name != 'Pypy' }} - name: Test (not single_cpu) uses: ./.github/actions/run-tests - if: ${{ matrix.name != 'Pypy' }} env: # Set pattern to not single_cpu if not already set PATTERN: ${{ env.PATTERN == '' && 'not single_cpu' || matrix.pattern }} diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 4de7aec4f551a..a38ec5ee359d9 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -101,7 +101,6 @@ jobs: - [macos-14, macosx_arm64] - [windows-2022, win_amd64] - [windows-11-arm, win_arm64] - # TODO: support PyPy? python: [["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"], ["cp313", "3.13"], ["cp313t", "3.13"]] include: # Build Pyodide wheels and upload them to Anaconda.org diff --git a/ci/deps/actions-pypy-39.yaml b/ci/deps/actions-pypy-39.yaml deleted file mode 100644 index da1e2bc2f934f..0000000000000 --- a/ci/deps/actions-pypy-39.yaml +++ /dev/null @@ -1,26 +0,0 @@ -name: pandas-dev -channels: - - conda-forge -dependencies: - # TODO: Add the rest of the dependencies in here - # once the other plentiful failures/segfaults - # with base pandas has been dealt with - - python=3.9[build=*_pypy] - - # build dependencies - - versioneer - - cython<4.0.0a0 - - meson=1.2.1 - - meson-python=0.13.1 - - # test dependencies - - pytest>=7.3.2 - - pytest-cov - - pytest-xdist>=3.4.0 - - hypothesis>=6.84.0 - - # required - - numpy - - python-dateutil - - pip: - - tzdata>=2023.3 diff --git a/scripts/validate_min_versions_in_sync.py b/scripts/validate_min_versions_in_sync.py index 7908aaef3d890..a45791f6c05cd 100755 --- a/scripts/validate_min_versions_in_sync.py +++ b/scripts/validate_min_versions_in_sync.py @@ -37,7 +37,6 @@ YAML_PATH = pathlib.Path("ci/deps") ENV_PATH = pathlib.Path("environment.yml") EXCLUDE_DEPS = {"tzdata", "pyqt", "pyqt5"} -EXCLUSION_LIST = frozenset(["python=3.8[build=*_pypy]"]) # pandas package is not available # in pre-commit environment sys.path.append("pandas/compat") @@ -111,7 +110,6 @@ def get_yaml_map_from( for dependency in yaml_dic: if ( isinstance(dependency, dict) - or dependency in EXCLUSION_LIST or dependency in yaml_map ): continue @@ -124,11 +122,6 @@ def get_yaml_map_from( yaml_package, yaml_version2 = yaml_dependency.split(operator) yaml_version2 = operator + yaml_version2 yaml_map[yaml_package] = [yaml_version1, yaml_version2] - elif "[build=*_pypy]" in dependency: - search_text = search_text.replace("[build=*_pypy]", "") - yaml_package, yaml_version = search_text.split(operator) - yaml_version = operator + yaml_version - yaml_map[yaml_package] = [yaml_version] elif operator is not None: yaml_package, yaml_version = search_text.split(operator) yaml_version = operator + yaml_version @@ -164,8 +157,6 @@ def pin_min_versions_to_yaml_file( ) -> str: data = yaml_file_data for yaml_package, yaml_versions in yaml_map.items(): - if yaml_package in EXCLUSION_LIST: - continue old_dep = yaml_package if yaml_versions is not None: old_dep = old_dep + ", ".join(yaml_versions)