rebase with dropped 3.5

Author: Yobmod

.appveyor.yml

@@ -6,29 +6,12 @@ environment:
     CYGWIN64_GIT_PATH: "C:\\cygwin64\\bin;%GIT_DAEMON_PATH%"
 
     matrix:
-      - 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:\\Python35-x64"
-        PYTHON_VERSION: "3.5"
-        IS_CYGWIN: "yes"
-        MAYFAIL: "yes"
-        GIT_PATH: "%CYGWIN64_GIT_PATH%"
 
 matrix:
     allow_failures:
@@ -76,18 +59,10 @@ install:
 build: false
 
 test_script:
-    -   IF "%IS_CYGWIN%" == "yes" (
-            nosetests -v
-        ) ELSE (
-            IF "%PYTHON_VERSION%" == "3.5" (
-                nosetests -v --with-coverage
-            ) ELSE (
-                nosetests -v
-            )
-        )
+    -   nosetests -v
 
 on_success:
-    - IF "%PYTHON_VERSION%" == "3.5" IF NOT "%IS_CYGWIN%" == "yes" (codecov)
+    - IF "%PYTHON_VERSION%" == "3.6" IF NOT "%IS_CYGWIN%" == "yes" (codecov)
 
 # Enable this to be able to login to the build worker. You can use the
 # `remmina` program in Ubuntu, use the login information that the line below

.github/workflows/pythonpackage.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2

.travis.yml

@@ -2,7 +2,6 @@
 language: python
 python:
   - "3.4"
-  - "3.5"
   - "3.6"
   - "3.7"
   - "3.8"
@@ -38,7 +37,7 @@ script:
   - ulimit -n
   - 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 cd doc && make html; fi
   - if [ "$TRAVIS_PYTHON_VERSION" == '3.6' ]; then flake8 --ignore=W293,E265,E266,W503,W504,E731; fi
 after_success:
   - codecov

README.md

@@ -34,7 +34,7 @@ If it is not in your `PATH`, you can help GitPython find it by setting
 the `GIT_PYTHON_GIT_EXECUTABLE=<path/to/git>` environment variable.
 
 * Git (1.7.x or newer)
-* Python >= 3.5
+* Python >= 3.6
 
 The list of dependencies are listed in `./requirements.txt` and `./test-requirements.txt`.
 The installer takes care of installing them for you.

doc/source/intro.rst

@@ -13,7 +13,7 @@ The object database implementation is optimized for handling large quantities of
 Requirements
 ============
 
-* `Python`_ >= 3.5
+* `Python`_ >= 3.6
 * `Git`_ 1.7.0 or newer
     It should also work with older versions, but it may be that some operations
     involving remotes will not work as expected.

git/cmd.py

@@ -150,7 +150,6 @@ def dashify(string: str) -> str:
 
 
 def slots_to_dict(self, exclude: Sequence[str] = ()) -> Dict[str, Any]:
-    # annotate self.__slots__ as Tuple[str, ...] once 3.5 dropped
     return {s: getattr(self, s) for s in self.__slots__ if s not in exclude}
 
 
@@ -462,7 +461,7 @@ class CatFileContentStream(object):
         If not all data is read to the end of the objects's lifetime, we read the
         rest to assure the underlying stream continues to work"""
 
-        __slots__ = ('_stream', '_nbr', '_size')
+        __slots__: Tuple[str, ...] = ('_stream', '_nbr', '_size')
 
         def __init__(self, size: int, stream: IO[bytes]) -> None:
             self._stream = stream

git/repo/base.py

@@ -519,7 +519,7 @@ def iter_trees(self, *args: Any, **kwargs: Any) -> Iterator['Tree']:
         :note: Takes all arguments known to iter_commits method"""
         return (c.tree for c in self.iter_commits(*args, **kwargs))
 
-    def tree(self, rev: Union['Commit', 'Tree', None] = None) -> 'Tree':
+    def tree(self, rev: Union['Commit', 'Tree', str, None] = None) -> 'Tree':
         """The Tree object for the given treeish revision
         Examples::
 

setup.py

@@ -99,7 +99,7 @@ def build_py_modules(basedir, excludes=[]):
     include_package_data=True,
     py_modules=build_py_modules("./git", excludes=["git.ext.*"]),
     package_dir={'git': 'git'},
-    python_requires='>=3.5',
+    python_requires='>=3.6',
     install_requires=requirements,
     tests_require=requirements + test_requirements,
     zip_safe=False,
@@ -123,7 +123,6 @@ def build_py_modules(basedir, excludes=[]):
         "Operating System :: MacOS :: MacOS X",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",