Undo more changes

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/build_pandas/action.yml

@@ -0,0 +1,17 @@
+name: Build pandas
+description: Rebuilds the C extensions and installs pandas
+runs:
+  using: composite
+  steps:
+
+    - name: Environment Detail
+      run: |
+        conda info
+        conda list
+      shell: bash -l {0}
+
+    - name: Build Pandas
+      run: |
+        python setup.py build_ext -j 2
+        python -m pip install -e . --no-build-isolation --no-use-pep517 --no-index
+      shell: bash -l {0}

.github/actions/setup/action.yml

@@ -35,7 +35,7 @@ runs:
       shell: bash
 
     - name: Install ${{ inputs.environment-file }} (Python ${{ inputs.python-version }})
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v2.1.1
       with:
         activate-environment: ${{ inputs.environment-name }}
         environment-file: ${{ inputs.environment-file }}

.github/workflows/asv-bot.yml

@@ -6,7 +6,8 @@ on:
       - created
 
 env:
-  COMMENT: ${{ github.event.comment.body }}
+  ENV_FILE: environment.yml
+  COMMENT: ${{github.event.comment.body}}
 
 jobs:
   autotune:
@@ -32,10 +33,20 @@ jobs:
         with:
           fetch-depth: 0
 
-      # Although asv sets up its own env, deps are still needed
-      # during discovery process
-      - name: Set up Conda
-        uses: ./.github/actions/setup
+      - name: Cache conda
+        uses: actions/cache@v2
+        with:
+          path: ~/conda_pkgs_dir
+          key: ${{ runner.os }}-conda-${{ hashFiles('${{ env.ENV_FILE }}') }}
+
+        # Although asv sets up its own env, deps are still needed
+        # during discovery process
+      - uses: conda-incubator/[email protected]
+        with:
+          activate-environment: pandas-dev
+          channel-priority: strict
+          environment-file: ${{ env.ENV_FILE }}
+          use-only-tar-bz2: true
 
       - name: Run benchmarks
         id: bench

.github/workflows/code-checks.yml

@@ -11,6 +11,7 @@ on:
       - 1.4.x
 
 env:
+  ENV_FILE: environment.yml
   PANDAS_CI: 1
 
 jobs:
@@ -51,13 +52,20 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Set up Conda
-      uses: ./.github/actions/setup
+    - name: Cache conda
+      uses: actions/cache@v2
+      with:
+        path: ~/conda_pkgs_dir
+        key: ${{ runner.os }}-conda-${{ hashFiles('${{ env.ENV_FILE }}') }}
 
-    - name: Build Pandas
-      uses: ./.github/actions/build-pandas
-      id: build
-      continue-on-error: true
+    - uses: conda-incubator/[email protected]
+      with:
+        mamba-version: "*"
+        channels: conda-forge
+        activate-environment: pandas-dev
+        channel-priority: strict
+        environment-file: ${{ env.ENV_FILE }}
+        use-only-tar-bz2: true
 
     - name: Install node.js (for pyright)
       uses: actions/setup-node@v2
@@ -68,6 +76,10 @@ jobs:
       # note: keep version in sync with .pre-commit-config.yaml
       run: npm install -g [email protected]
 
+    - name: Build Pandas
+      id: build
+      uses: ./.github/actions/build_pandas
+
     - name: Run checks on imported code
       run: ci/code_checks.sh code
       if: ${{ steps.build.outcome == 'success' }}
@@ -106,11 +118,24 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Set up Conda
-      uses: ./.github/actions/setup
+    - name: Cache conda
+      uses: actions/cache@v2
+      with:
+        path: ~/conda_pkgs_dir
+        key: ${{ runner.os }}-conda-${{ hashFiles('${{ env.ENV_FILE }}') }}
+
+    - uses: conda-incubator/[email protected]
+      with:
+        mamba-version: "*"
+        channels: conda-forge
+        activate-environment: pandas-dev
+        channel-priority: strict
+        environment-file: ${{ env.ENV_FILE }}
+        use-only-tar-bz2: true
 
     - name: Build Pandas
-      uses: ./.github/actions/build-pandas
+      id: build
+      uses: ./.github/actions/build_pandas
 
     - name: Run ASV benchmarks
       run: |
@@ -123,6 +148,7 @@ jobs:
         if grep "failed" benchmarks.log > /dev/null ; then
             exit 1
         fi
+      if: ${{ steps.build.outcome == 'success' }}
 
     - name: Publish benchmarks artifact
       uses: actions/upload-artifact@v2

.github/workflows/docbuild-and-upload.yml

@@ -11,6 +11,7 @@ on:
       - 1.4.x
 
 env:
+  ENV_FILE: environment.yml
   PANDAS_CI: 1
 
 jobs:
@@ -32,17 +33,17 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Set up Conda
+    - name: Set up pandas
       uses: ./.github/actions/setup
 
-    - name: Build pandas
-      uses: ./.github/actions/build-pandas
-
     - name: Build website
-      run: python web/pandas_web.py web/pandas --target-path=web/build
-
+      run: |
+        source activate pandas-dev
+        python web/pandas_web.py web/pandas --target-path=web/build
     - name: Build documentation
-      run: doc/make.py --warnings-are-errors
+      run: |
+        source activate pandas-dev
+        doc/make.py --warnings-are-errors
 
     - name: Install ssh key
       run: |