Skip to content

Commit 5b6fe83

Browse files
committed
Update typing-extensions version in requirements.txt
1 parent 7ca97dc commit 5b6fe83

27 files changed

+279
-190
lines changed

.appveyor.yml

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,12 @@ environment:
66
CYGWIN64_GIT_PATH: "C:\\cygwin64\\bin;%GIT_DAEMON_PATH%"
77

88
matrix:
9-
- PYTHON: "C:\\Python34-x64"
10-
PYTHON_VERSION: "3.4"
11-
GIT_PATH: "%GIT_DAEMON_PATH%"
12-
- PYTHON: "C:\\Python35-x64"
13-
PYTHON_VERSION: "3.5"
14-
GIT_PATH: "%GIT_DAEMON_PATH%"
159
- PYTHON: "C:\\Python36-x64"
1610
PYTHON_VERSION: "3.6"
1711
GIT_PATH: "%GIT_DAEMON_PATH%"
1812
- PYTHON: "C:\\Python37-x64"
1913
PYTHON_VERSION: "3.7"
2014
GIT_PATH: "%GIT_DAEMON_PATH%"
21-
- PYTHON: "C:\\Miniconda35-x64"
22-
PYTHON_VERSION: "3.5"
23-
IS_CONDA: "yes"
24-
MAYFAIL: "yes"
25-
GIT_PATH: "%GIT_DAEMON_PATH%"
26-
## Cygwin
27-
- PYTHON: "C:\\Python35-x64"
28-
PYTHON_VERSION: "3.5"
29-
IS_CYGWIN: "yes"
30-
MAYFAIL: "yes"
31-
GIT_PATH: "%CYGWIN64_GIT_PATH%"
3215

3316
matrix:
3417
allow_failures:
@@ -76,18 +59,10 @@ install:
7659
build: false
7760

7861
test_script:
79-
- IF "%IS_CYGWIN%" == "yes" (
80-
nosetests -v
81-
) ELSE (
82-
IF "%PYTHON_VERSION%" == "3.5" (
83-
nosetests -v --with-coverage
84-
) ELSE (
85-
nosetests -v
86-
)
87-
)
62+
- nosetests -v
8863

8964
on_success:
90-
- IF "%PYTHON_VERSION%" == "3.5" IF NOT "%IS_CYGWIN%" == "yes" (codecov)
65+
- IF "%PYTHON_VERSION%" == "3.6" IF NOT "%IS_CYGWIN%" == "yes" (codecov)
9166

9267
# Enable this to be able to login to the build worker. You can use the
9368
# `remmina` program in Ubuntu, use the login information that the line below

.github/workflows/pythonpackage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
18+
python-version: [3.6, 3.7, 3.8, 3.9]
1919

2020
steps:
2121
- uses: actions/checkout@v2

.travis.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

CHANGES

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Please see the online documentation for the latest changelog:
2-
https://github.com/gitpython-developers/GitPython/blob/master/doc/source/changes.rst
2+
https://github.com/gitpython-developers/GitPython/blob/main/doc/source/changes.rst

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ If it is not in your `PATH`, you can help GitPython find it by setting
3434
the `GIT_PYTHON_GIT_EXECUTABLE=<path/to/git>` environment variable.
3535

3636
* Git (1.7.x or newer)
37-
* Python >= 3.5
37+
* Python >= 3.6
3838

3939
The list of dependencies are listed in `./requirements.txt` and `./test-requirements.txt`.
4040
The installer takes care of installing them for you.

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.17
1+
3.1.18

doc/source/changes.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
Changelog
33
=========
44

5+
3.1.18
6+
======
7+
8+
* drop support for python 3.5 to reduce maintenance burden on typing. Lower patch levels of python 3.5 would break, too.
9+
10+
See the following for details:
11+
https://github.com/gitpython-developers/gitpython/milestone/50?closed=1
12+
513
3.1.17
614
======
715

doc/source/intro.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The object database implementation is optimized for handling large quantities of
1313
Requirements
1414
============
1515

16-
* `Python`_ >= 3.5
16+
* `Python`_ >= 3.6
1717
* `Git`_ 1.7.0 or newer
1818
It should also work with older versions, but it may be that some operations
1919
involving remotes will not work as expected.

doc/source/tutorial.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ GitPython Tutorial
1010

1111
GitPython provides object model access to your git repository. This tutorial is composed of multiple sections, most of which explains a real-life usecase.
1212

13-
All code presented here originated from `test_docs.py <https://github.com/gitpython-developers/GitPython/blob/master/test/test_docs.py>`_ to assure correctness. Knowing this should also allow you to more easily run the code for your own testing purposes, all you need is a developer installation of git-python.
13+
All code presented here originated from `test_docs.py <https://github.com/gitpython-developers/GitPython/blob/main/test/test_docs.py>`_ to assure correctness. Knowing this should also allow you to more easily run the code for your own testing purposes, all you need is a developer installation of git-python.
1414

1515
Meet the Repo type
1616
******************

git/cmd.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
import subprocess
1818
import sys
1919
import threading
20-
from collections import OrderedDict
2120
from textwrap import dedent
22-
import warnings
2321

2422
from git.compat import (
2523
defenc,
@@ -150,7 +148,6 @@ def dashify(string: str) -> str:
150148

151149

152150
def slots_to_dict(self, exclude: Sequence[str] = ()) -> Dict[str, Any]:
153-
# annotate self.__slots__ as Tuple[str, ...] once 3.5 dropped
154151
return {s: getattr(self, s) for s in self.__slots__ if s not in exclude}
155152

156153

@@ -462,7 +459,7 @@ class CatFileContentStream(object):
462459
If not all data is read to the end of the objects's lifetime, we read the
463460
rest to assure the underlying stream continues to work"""
464461

465-
__slots__ = ('_stream', '_nbr', '_size')
462+
__slots__: Tuple[str, ...] = ('_stream', '_nbr', '_size')
466463

467464
def __init__(self, size: int, stream: IO[bytes]) -> None:
468465
self._stream = stream
@@ -1005,13 +1002,6 @@ def transform_kwarg(self, name: str, value: Any, split_single_char_options: bool
10051002

10061003
def transform_kwargs(self, split_single_char_options: bool = True, **kwargs: Any) -> List[str]:
10071004
"""Transforms Python style kwargs into git command line options."""
1008-
# Python 3.6 preserves the order of kwargs and thus has a stable
1009-
# order. For older versions sort the kwargs by the key to get a stable
1010-
# order.
1011-
if sys.version_info[:2] < (3, 6):
1012-
kwargs = OrderedDict(sorted(kwargs.items(), key=lambda x: x[0]))
1013-
warnings.warn("Python 3.5 support is deprecated and will be removed 2021-09-05.\n" +
1014-
"It does not preserve the order for key-word arguments and enforce lexical sorting instead.")
10151005
args = []
10161006
for k, v in kwargs.items():
10171007
if isinstance(v, (list, tuple)):

0 commit comments

Comments
 (0)