Merge pull request #1289 from gitpython-developers/pytest

Tidying up, and replace nose with pytest.
No code changes, and i've been working on my branch with pytest with no problems, so i'm merging now

1 files changed, 28 insertions, 10 deletions

diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index c9faf0f1..e575a016 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -15,48 +15,66 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10.0-beta.3"]
 
     steps:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 9999
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies and prepare tests
       run: |
         set -x
-        python -m pip install --upgrade pip
+        python -m pip install --upgrade pip setuptools wheel
         python --version; git --version
         git submodule update --init --recursive
         git fetch --tags
-        
+
+        pip install -r requirements.txt
         pip install -r test-requirements.txt
         TRAVIS=yes ./init-tests-after-clone.sh
-        
+
         git config --global user.email "travis@ci.com"
         git config --global user.name "Travis Runner"
         # If we rewrite the user's config by accident, we will mess it up
         # and cause subsequent tests to fail
         cat test/fixtures/.gitconfig >> ~/.gitconfig
+
     - name: Lint with flake8
-    
       run: |
         set -x
         pip install flake8
         # stop the build if there are Python syntax errors or undefined names
-        flake8 --ignore=W293,E265,E266,W503,W504,E731 --count  --show-source --statistics
-        
+        flake8 --ignore=W293,E265,E266,W503,W504,E704,E731 --count  --show-source --statistics
+
     - name: Check types with mypy
       run: |
         set -x
-        pip install tox
-        tox -e type
+        pip install mypy
+        mypy -p git
+
+    - name: Test with pytest
+      run: |
+        set -x
+        pip install -r requirements-dev.txt
+        pytest --cov --cov-report=term
+        # pytest settings in tox.ini[pytest]
+      continue-on-error: false
 
     - name: Documentation
       run: |
         set -x
         pip install -r doc/requirements.txt
         make -C doc html
+
+    # - name: Test with nose
+      # run: |
+        # set -x
+        # pip install nose
+        # nosetests -v --with-coverage
+      # continue-on-error: false
+
+