@@ -1,39 +1,38 @@
+# UNUSED, only for reference. If windows testing is needed, please add that to github actions
 # CI on Windows via appveyor
 environment:
     GIT_DAEMON_PATH:   "C:\\Program Files\\Git\\mingw64\\libexec\\git-core"
     CYGWIN_GIT_PATH:   "C:\\cygwin\\bin;%GIT_DAEMON_PATH%"
     CYGWIN64_GIT_PATH: "C:\\cygwin64\\bin;%GIT_DAEMON_PATH%"
 
     matrix:
-        ## MINGW
-        #
-      - PYTHON: "C:\\Python27"
-        PYTHON_VERSION: "2.7"
-        GIT_PATH: "%GIT_DAEMON_PATH%"
       - PYTHON: "C:\\Python34-x64"
         PYTHON_VERSION: "3.4"
         GIT_PATH: "%GIT_DAEMON_PATH%"
       - PYTHON: "C:\\Python35-x64"
         PYTHON_VERSION: "3.5"
         GIT_PATH: "%GIT_DAEMON_PATH%"
+      - PYTHON: "C:\\Python36-x64"
+        PYTHON_VERSION: "3.6"
+        GIT_PATH: "%GIT_DAEMON_PATH%"
+      - PYTHON: "C:\\Python37-x64"
+        PYTHON_VERSION: "3.7"
+        GIT_PATH: "%GIT_DAEMON_PATH%"
       - PYTHON: "C:\\Miniconda35-x64"
         PYTHON_VERSION: "3.5"
         IS_CONDA: "yes"
+        MAYFAIL: "yes"
         GIT_PATH: "%GIT_DAEMON_PATH%"
-
         ## Cygwin
-        #
-      - PYTHON: "C:\\Miniconda-x64"
-        PYTHON_VERSION: "2.7"
-        IS_CONDA: "yes"
-        IS_CYGWIN: "yes"
-        GIT_PATH: "%CYGWIN_GIT_PATH%"
       - PYTHON: "C:\\Python35-x64"
         PYTHON_VERSION: "3.5"
-        GIT_PATH: "%CYGWIN64_GIT_PATH%"
         IS_CYGWIN: "yes"
+        MAYFAIL: "yes"
+        GIT_PATH: "%CYGWIN64_GIT_PATH%"
 
-
+matrix:
+    allow_failures:
+        - MAYFAIL: "yes"
 install:
     - set PATH=%PYTHON%;%PYTHON%\Scripts;%GIT_PATH%;%PATH%
 
@@ -51,6 +50,7 @@ install:
         conda info -a &
         conda install --yes --quiet  pip
       )
+    - pip install -r requirements.txt
     - pip install -r test-requirements.txt
     - pip install codecov
 
 
@@ -0,0 +1,15 @@
+version = 1
+
+test_patterns = [
+  'test/**/test_*.py'
+]
+
+exclude_patterns = [
+  'doc/**',
+  'etc/sublime-text'
+]
+
+[[analyzers]]
+name = 'python'
+enabled = true
+runtime_version = '3.x.x'
@@ -0,0 +1,2 @@
+.git/
+.tox/
@@ -1,2 +1,2 @@
-git/test/fixtures/* eol=lf
+test/fixtures/* eol=lf
 init-tests-after-clone.sh
@@ -0,0 +1,59 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python package
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 9999
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies and prepare tests
+      run: |
+        set -x
+        python -m pip install --upgrade pip
+        python --version; git --version
+        git submodule update --init --recursive
+        git fetch --tags
+        
+        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
+    - name: Test with nose
+      run: |
+        set -x
+        pip install nose
+        nosetests -v --with-coverage
+    - name: Documentation
+      run: |
+        set -x
+        pip install -r doc/requirements.txt
+        make -C doc html
@@ -2,6 +2,7 @@
 *.swp
 *~
 .venv/
+venv/
 /*.egg-info
 /lib/GitPython.egg-info
 cover/
@@ -14,3 +15,9 @@ nbproject
 .DS_Store
 /*egg-info
 /.tox
+/.vscode/
+.idea/
+.cache/
+.mypy_cache/
+.pytest_cache/
+monkeytype.sqlite3
@@ -1,3 +1,3 @@
-[submodule "gitdb"]
-	url = https://github.com/gitpython-developers/gitdb.git
-	path = git/ext/gitdb
+[submodule "gitdb"]
+	url = https://github.com/gitpython-developers/gitdb.git
+	path = git/ext/gitdb
@@ -1,17 +1,15 @@
+# UNUSED, only for reference. If adjustments are needed, please see github actions
 language: python
 python:
-  - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
-  - "3.6-dev"
-  - "3.7-dev"
+  - "3.7"
+  - "3.8"
   - "nightly"
   # - "pypy" - won't work as smmap doesn't work (see gitdb/.travis.yml for details)
 matrix:
   allow_failures:
-    - python: "3.6-dev"
-    - python: "3.7-dev"
     - python: "nightly"
 git:
   # a higher depth is needed for most of the tests - must be high enough to not actually be shallow
@@ -22,7 +20,8 @@ install:
   - git submodule update --init --recursive
   - git fetch --tags
   - pip install -r test-requirements.txt
-  - pip install codecov sphinx
+  - pip install -r doc/requirements.txt
+  - pip install codecov
 
   # generate some reflog as git-python tests need it (in master)
   - ./init-tests-after-clone.sh
@@ -37,9 +36,9 @@ script:
   # Make sure we limit open handles to see if we are leaking them
   - ulimit -n 128
   - ulimit -n
-  - nosetests -v --with-coverage
-  - if [ "$TRAVIS_PYTHON_VERSION" == '3.4' ]; then flake8; fi
+  - coverage run --omit="test/*" -m unittest --buffer
+  - coverage report
   - if [ "$TRAVIS_PYTHON_VERSION" == '3.5' ]; then cd doc && make html; fi
-  -
+  - if [ "$TRAVIS_PYTHON_VERSION" == '3.6' ]; then flake8 --ignore=W293,E265,E266,W503,W504,E731; fi
 after_success:
   - codecov
@@ -26,5 +26,21 @@ Contributors are:
 -Mikuláš Poul <mikulaspoul _at_ gmail.com>
 -Charles Bouchard-Légaré <cblegare.atl _at_ ntis.ca>
 -Yaroslav Halchenko <debian _at_ onerussian.com>
-
+-Tim Swast <swast _at_ google.com>
+-William Luc Ritchie
+-David Host <hostdm _at_ outlook.com>
+-A. Jesse Jiryu Davis <jesse _at_ emptysquare.net>
+-Steven Whitman <ninloot _at_ gmail.com>
+-Stefan Stancu <stefan.stancu _at_ gmail.com>
+-César Izurieta <cesar _at_ caih.org>
+-Arthur Milchior <arthur _at_ milchior.fr>
+-Anil Khatri <anil.soccer.khatri _at_ gmail.com>
+-JJ Graham <thetwoj _at_ gmail.com>
+-Ben Thayer <ben _at_ benthayer.com>
+-Dries Kennes <admin _at_ dries007.net>
+-Pratik Anurag <panurag247365 _at_ gmail.com>
+-Harmon <harmon.public _at_ gmail.com>
+-Liam Beguin <liambeguin _at_ gmail.com>
+-Ram Rachum <ram _at_ rachum.com>
+-Alba Mendez <me _at_ alba.sh>
 Portions derived from other open source works and are clearly marked.
@@ -1,7 +1,10 @@
 ### How to contribute
 
-* [fork this project](https://github.com/gitpython-developers/GitPython/fork) on GitHub
-* For setting up the environment to run the self tests, look at `.travis.yml`.
-* Add yourself to AUTHORS.md and write your patch. **Write a test that fails unless your patch is present.**
-* Initiate a pull request
+The following is a short step-by-step rundown of what one typically would do to contribute.
+
+* [fork this project](https://github.com/gitpython-developers/GitPython/fork) on GitHub.
+* For setting up the environment to run the self tests, please look at `.travis.yml`.
+* Please try to **write a test that fails unless the contribution is present.**
+* Feel free to add yourself to AUTHORS file. 
+* Create a pull request.
Original file line number	Diff line number	Diff line change
@@ -1,2 +1,2 @@
1		- git/test/fixtures/* eol=lf
	1	+ test/fixtures/* eol=lf
2	2	init-tests-after-clone.sh