Drop python 2 support, again (revert previous revert) · gitpython-developers/GitPython@2e7e82b · GitHub

gitpython-developers / GitPython Public

• Notifications You must be signed in to change notification settings
• Fork 989
• Star 5.2k

• Code
• Issues 8
• Pull requests 2
• Discussions
• Actions
• Security and quality 34
• Insights

Additional navigation options

Commit 2e7e82b

Browse filesBrowse the repository at this point in the historyBrowse files

Sebastian Thiel

committed

Drop python 2 support, again (revert previous revert)

This reverts commit 913d806.

1 parent 0b6b90f commit 2e7e82b
Copy full SHA for 2e7e82b

7 files changed

+10-7Lines changed: 10 additions & 7 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .travis.yml
• README.md
• doc/source
  • intro.rst
• git
  • compat.py
  • repo
    • base.py
• requirements.txt
• setup.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.travis.yml‎

Copy file name to clipboardExpand all lines: .travis.yml

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1,6 +1,5 @@
1	1	language: python
2	2	python:
3		- - "2.7"
4	3	- "3.4"
5	4	- "3.5"
6	5	- "3.6"

Collapse file

‎README.md‎

Copy file name to clipboardExpand all lines: README.md

+1-1Lines changed: 1 addition & 1 deletion

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -19,7 +19,7 @@ If it is not in your `PATH`, you can help GitPython find it by setting
19	19	the `GIT_PYTHON_GIT_EXECUTABLE=<path/to/git>` environment variable.
20	20
21	21	* Git (1.7.x or newer)
22		- * Python 2.7 to 3.7.
	22	+ * Python 3 to 3.7.
23	23
24	24	The list of dependencies are listed in `./requirements.txt` and `./test-requirements.txt`.
25	25	The installer takes care of installing them for you.

Collapse file

‎doc/source/intro.rst‎

Copy file name to clipboardExpand all lines: doc/source/intro.rst

+1-1Lines changed: 1 addition & 1 deletion

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ The object database implementation is optimized for handling large quantities of
13	13	Requirements
14	14	============
15	15
16		- * `Python`_ 2.7 or newer
	16	+ * `Python`_ 3.0 or newer
17	17	* `Git`_ 1.7.0 or newer
18	18	It should also work with older versions, but it may be that some operations
19	19	involving remotes will not work as expected.

Collapse file

‎git/compat.py‎

Copy file name to clipboardExpand all lines: git/compat.py

+4-1Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -30,7 +30,10 @@
30	30	is_win = (os.name == 'nt')
31	31	is_posix = (os.name == 'posix')
32	32	is_darwin = (os.name == 'darwin')
33		- defenc = sys.getdefaultencoding()
	33	+ if hasattr(sys, 'getfilesystemencoding'):
	34	+ defenc = sys.getfilesystemencoding()
	35	+ if defenc is None:
	36	+ defenc = sys.getdefaultencoding()
34	37
35	38	if PY3:
36	39	import io

Collapse file

‎git/repo/base.py‎

Copy file name to clipboardExpand all lines: git/repo/base.py

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -4,6 +4,7 @@
4	4	# This module is part of GitPython and is released under
5	5	# the BSD License: http://www.opensource.org/licenses/bsd-license.php
6	6
	7	+ from builtins import str
7	8	from collections import namedtuple
8	9	import logging
9	10	import os

Collapse file

‎requirements.txt‎

Copy file name to clipboard

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -1 +1,3 @@
1	1	gitdb2 (>=2.0.0)
	2	+ gitdb>=0.6.4
	3	+ ddt>=1.1.1

Collapse file

‎setup.py‎

Copy file name to clipboardExpand all lines: setup.py

+1-3Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -79,7 +79,7 @@ def _stamp_version(filename):
79	79	package_data={'git.test': ['fixtures/*']},
80	80	package_dir={'git': 'git'},
81	81	license="BSD License",
82		- python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
	82	+ python_requires='>=3.0, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
83	83	install_requires=requirements,
84	84	tests_require=requirements + test_requirements,
85	85	zip_safe=False,
@@ -102,8 +102,6 @@ def _stamp_version(filename):
102	102	"Operating System :: Microsoft :: Windows",
103	103	"Operating System :: MacOS :: MacOS X",
104	104	"Programming Language :: Python",
105		- "Programming Language :: Python :: 2",
106		- "Programming Language :: Python :: 2.7",
107	105	"Programming Language :: Python :: 3",
108	106	"Programming Language :: Python :: 3.4",
109	107	"Programming Language :: Python :: 3.5",

0 commit comments

Comments

0 (0)