separate r and python; fix r_libs_user

.github/workflows/pre-commit.yml

@@ -17,9 +17,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Check Ubuntu version
+      - name: Set up environment
         run: |
           echo "UBUNTU_VERSION=`grep DISTRIB_RELEASE /etc/lsb-release | sed 's/.*=//g'`" >> $GITHUB_ENV
+          mkdir -p .local/R/site-packages
+          echo "R_LIBS_USER=`pwd`/.local/R/site-packages" >> $GITHUB_ENV
 
       - name: Set up Python
         uses: actions/setup-python@v2

.github/workflows/run_tests.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
 
-  run_tester:
+  test_python:
     runs-on: ${{ matrix.config.os }}
     if: "!contains(github.event.head_commit.message, 'ci skip')"
 
@@ -60,14 +60,87 @@ jobs:
         nose2 -vvv
         cd ..
 
+    - name: Build docs
+      run: |
+        cd python
+        pip install .[doc]
+        cd doc
+        make html
+        cd ../..
+
+    - name: Coveralls
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        COVERALLS_SERVICE_NAME: github
+      run: |
+        coveralls
+
+    - name: Upload check results on fail
+      if: failure()
+      uses: actions/upload-artifact@master
+      with:
+        name: ${{ matrix.config.name }}_results
+        path: check
+
+  test_r:
+    runs-on: ${{ matrix.config.os }}
+    if: "!contains(github.event.head_commit.message, 'ci skip')"
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+        - {name: 'devel', os: ubuntu-latest, r: 'devel' }
+        - {name: 'release', os: ubuntu-latest, r: 'release' }
+        - {name: 'oldrel', os: ubuntu-latest, r: 'oldrel' }
+
+    steps:
+    - name: Cancel Previous Runs
+      uses: styfle/cancel-workflow-action@0.6.0
+      with:
+        access_token: ${{ github.token }}
+
+    - name: Set up environment
+      run: |
+        echo "UBUNTU_VERSION=`grep DISTRIB_RELEASE /etc/lsb-release | sed 's/.*=//g'`" >> $GITHUB_ENV
+        mkdir -p .local/R/site-packages
+        echo "R_LIBS_USER=`pwd`/.local/R/site-packages" >> $GITHUB_ENV
+
+    - uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.config.python }}
+
+    - name: Cache Python packages
+      uses: actions/cache@v2
+      with:
+        path: ${{ env.pythonLocation }}
+        key: ${{runner.os}}-pip-${{ env.pythonLocation }}-${{ hashFiles('python/setup.py') }}
+        restore-keys: ${{runner.os}}-pip-${{ env.pythonLocation }}-
+
+    - name: Install package & dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -U wheel setuptools
+        pip install -U ./python
+        python -c "import magic"
+
+    - name: Set up R
+      id: setup-r
+      uses: r-lib/actions/setup-r@v1
+      with:
+        r-version: ${{ matrix.config.r }}
+
     - name: Cache R packages
       uses: actions/cache@v2
       if: startsWith(runner.os, 'Linux')
       with:
         path: ${{env.R_LIBS_USER}}
-        key: precommit-${{env.UBUNTU_VERSION}}-renv-${{ hashFiles('.pre-commit.r_requirements.txt') }}-
+        key: test-${{env.UBUNTU_VERSION}}-renv-${{ steps.setup-r.outputs.installed-r-version }}-${{ hashFiles('Rmagic/DESCRIPTION') }}-
         restore-keys: |
-          precommit-${{env.UBUNTU_VERSION}}-renv-
+          test-${{env.UBUNTU_VERSION}}-renv-${{ steps.setup-r.outputs.installed-r-version }}-
 
     - name: Install R packages
       run: |
@@ -81,21 +154,6 @@ jobs:
         R CMD check --as-cran *.tar.gz
         cd ..
 
-    - name: Build docs
-      run: |
-        cd python
-        pip install .[doc]
-        cd doc
-        make html
-        cd ../..
-
-    - name: Coveralls
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        COVERALLS_SERVICE_NAME: github
-      run: |
-        coveralls
-
     - name: Upload check results on fail
       if: failure()
       uses: actions/upload-artifact@master