E584 Merge pull request #1188 from Yobmod/main · CoderboticsAI/GitPython@20f4a9d · GitHub
[go: up one dir, main page]
Skip to content

Commit 20f4a9d

Browse files
ByronByron
authored
Merge pull request gitpython-developers#1188 from Yobmod/main
Drop python 3.4, prep for adding types
2 parents 90c4db1 + 26ccee1 commit 20f4a9d

File tree

10 files changed

+26
-5
lines changed

10 files changed

+26
-5
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ nbproject
1818
/.vscode/
1919
.idea/
2020
.cache/
21+
.mypy_cache/
22+
.pytest_cache/
23+
monkeytype.sqlite3

‎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.4
37+
* Python >= 3.5
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.

‎doc/source/changes.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Changelog
88
* git.Commit objects now have a ``replace`` method that will return a
99
copy of the commit with modified attributes.
1010
* Add python 3.9 support
11+
* Drop python 3.4 support
1112

1213
3.1.13
1314
======

‎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.4
16+
* `Python`_ >= 3.5
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.

‎git/py.typed

Whitespace-only changes.

‎git/types.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import os # @UnusedImport ## not really unused, is in type string
2+
from typing import Union, Any
3+
4+
5+
TBD = Any
6+
PathLike = Union[str, 'os.PathLike[str]']

‎mypy.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
[mypy]
3+
4+
disallow_untyped_defs = True

‎setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,11 @@ def build_py_modules(basedir, excludes=[]):
9595
license="BSD",
9696
url="https://github.com/gitpython-developers/GitPython",
9797
packages=find_packages(exclude=("test.*")),
98+
package_data={'git': ['**/*.pyi', 'py.typed']},
9899
include_package_data=True,
99100
py_modules=build_py_modules("./git", excludes=["git.ext.*"]),
100101
package_dir={'git': 'git'},
101-
python_requires='>=3.4',
102+
python_requires='>=3.5',
102103
install_requires=requirements,
103104
tests_require=requirements + test_requirements,
104105
zip_safe=False,
@@ -122,7 +123,6 @@ def build_py_modules(basedir, excludes=[]):
122123
"Operating System :: MacOS :: MacOS X",
123124
"Programming Language :: Python",
124125
"Programming Language :: Python :: 3",
125-
"Programming Language :: Python :: 3.4",
126126
"Programming Language :: Python :: 3.5",
127127
"Programming Language :: Python :: 3.6",
128128
"Programming Language :: Python :: 3.7",

‎test/tstrunner.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import unittest
2+
loader = unittest.TestLoader()
3+
start_dir = '.'
4+
suite = loader.discover(start_dir)
5+
6+
runner = unittest.TextTestRunner()
7+
runner.run(suite)

‎tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py34,py35,py36,py37,py38,py39,flake8
2+
envlist = py35,py36,py37,py38,py39,flake8
33

44
[testenv]
55
commands = python -m unittest --buffer {posargs}

0 commit comments

Comments
 (0)
0