Merge adcce49 into 2e44231

.github/workflows/main.yml

@@ -28,6 +28,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Set PYENV_ROOT
+        run: echo "PYENV_ROOT=${RUNNER_TEMP}/pyenv" >> $GITHUB_ENV
       - name: Cache Python installation
         uses: actions/cache@v2
         id: cache-python
@@ -39,7 +41,7 @@ jobs:
         if: steps.cache-python.outputs.cache-hit != 'true'
 
       - name: Install Pipenv
-        run: pip install pipenv
+        run: pyenv run pip install pipenv
       - name: Cache Pip dependencies
         id: cache-pipenv
         uses: actions/cache@v2
@@ -48,13 +50,13 @@ jobs:
           key: ${{ runner.os }}-python${{ matrix.python-version }}-pipenv-${{ hashFiles('**/Pipfile.lock') }}-v2
       - name: Install Pip dependencies
         if: steps.cache-pipenv.outputs.cache-hit != 'true'
-        run: pipenv install --dev
+        run: pyenv run pipenv install --dev
 
       - name: Build
-        run: pipenv run make
+        run: pyenv run pipenv run make
 
       - name: Test
-        run: NONPAIRS=/tmp/languages pipenv run make test
+        run: NONPAIRS=/tmp/languages pyenv run pipenv run make unit-test
   lint:
     runs-on: ubuntu-latest
     container: ghcr.io/apertium/apertium-apy-cicd

Makefile

@@ -14,6 +14,11 @@ test-release: langNames.db
 	twine upload --sign --repository-url https://test.pypi.org/legacy/ dist/*
 
 unit-test:
+	pipenv --venv
+	pipenv --where
+	which python3
+	which python
+	pipenv --support
 	python3 -m unittest tests/test*.py
 
 lint: