Simplify

Author: jonashaag

.circleci/config.yml

@@ -13,7 +13,7 @@ jobs:
       PANDAS_CI: "1"
     steps:
       - checkout
-      - run: .circleci/setup_env.sh
+      - run: ci/setup_env.sh
       - run: PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH ci/run_tests.sh
 
 workflows:

.github/actions/setup-pandas/action.yml

@@ -0,0 +1,31 @@
+name: Set up pandas
+description: Runs all the setup steps required to have a built pandas ready to use
+inputs:
+  environment-file:
+    default: environment.yml
+  pyarrow-version:
+      required: false
+runs:
+  using: composite
+  steps:
+    - name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }}
+      run: |
+        grep -q '  - pyarrow' ${{ inputs.environment-file }}
+        sed -i"" -e "s/  - pyarrow/  - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }}
+        cat ${{ inputs.environment-file }}
+      shell: bash
+      if: ${{ inputs.pyarrow-version }}
+
+    - name: Pin setuptools (GH#44980)
+      run: |
+        echo '  - setuptools <60' >> ${{ inputs.environment-file }}
+      shell: bash
+
+    - name: Install ${{ inputs.environment-file }}
+      uses: conda-incubator/setup-miniconda@v2
+      with:
+        environment-file: ${{ inputs.environment-file }}
+        channel-priority: strict
+        channels: conda-forge
+        mamba-version: "0.22"
+        use-mamba: true

.github/actions/setup/action.yml

@@ -1,58 +1,12 @@
 name: Set up pandas
 description: Runs all the setup steps required to have a built pandas ready to use
-inputs:
-  environment-file:
-    default: environment.yml
-  pyarrow-version:
-      required: false
-  is-pypy:
-    default: false
-  environment-name:
-    default: pandas-dev
-  python-version:
-    required: false
 runs:
   using: composite
   steps:
-    - name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }}
-      run: |
-        grep -q '  - pyarrow' ${{ inputs.environment-file }}
-        sed -i"" -e "s/  - pyarrow/  - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }}
-        cat ${{ inputs.environment-file }}
-      shell: bash
-      if: ${{ inputs.pyarrow-version }}
+    - name: Setting conda path
+      run: echo "${HOME}/miniconda3/bin" >> $GITHUB_PATH
+      shell: bash -el {0}
 
-    - name: Set Python version in ${{ inputs.environment-file }} to ${{ inputs.python-version }}
-      run: |
-        echo "  - python=${{ inputs.pyarrow-version }}" >> ${{ inputs.environment-file }}
-        cat ${{ inputs.environment-file }}
-      shell: bash
-      if: ${{ inputs.python-version }}
-
-    - name: Pin setuptools (GH#44980)
-      run: |
-        echo '  - setuptools <60' >> ${{ inputs.environment-file }}
-      shell: bash
-
-    - name: Install ${{ inputs.environment-file }} (Python ${{ inputs.python-version }})
-      uses: conda-incubator/setup-miniconda@v2
-      with:
-        activate-environment: ${{ inputs.environment-name }}
-        environment-file: ${{ inputs.environment-file }}
-        channel-priority: strict
-        channels: conda-forge
-        mamba-version: "0.22"
-        use-mamba: true
-      if: ${{ inputs.is-pypy == 'false' }} # No pypy3.8 support
-
-    - name: Setup PyPy
-      uses: actions/setup-python@v3
-      with:
-        python-version: "pypy-3.8"
-      if: ${{ inputs.is-pypy == 'true' }}
-
-    - name: Setup PyPy dependencies
-      # TODO: re-enable cov, its slowing the tests down though
-      run: pip install Cython numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31.0 hypothesis>=5.5.3 pytest-asyncio>=0.17
-      shell: bash
-      if: ${{ inputs.is-pypy == 'true' }}
+    - name: Setup environment and build pandas
+      run: ci/setup_env.sh
+      shell: bash -el {0}

.github/workflows/macos-windows.yml

@@ -48,7 +48,7 @@ jobs:
       if: ${{ runner.os == 'Windows' }}
 
     - name: Set up Conda (${{ matrix.env_file }}, Arrow ${{ matrix.pyarrow_version}})
-      uses: ./.github/actions/setup
+      uses: ./.github/actions/setup-pandas
       with:
         environment-file: ci/deps/${{ matrix.env_file }}
         pyarrow-version: ${{ matrix.pyarrow_version }}