Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb0f79c5

Browse files
committed
Revert "Revert "Remove support for Python 3.5" - fix CI for now."
This reverts commit820d3cc.
1 parent820d3cc commitb0f79c5

File tree

7 files changed

+9
-45
lines changed

7 files changed

+9
-45
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: 2 additions & 2 deletions
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
@@ -61,4 +61,4 @@ jobs:
6161
run:|
6262
set -x
6363
pip install -r doc/requirements.txt
64-
make -C doc html
64+
make -C doc html

‎.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# UNUSED, only for reference. If adjustments are needed, please see github actions
22
language:python
33
python:
4-
-"3.4"
5-
-"3.5"
64
-"3.6"
75
-"3.7"
86
-"3.8"
@@ -38,7 +36,7 @@ script:
3836
-ulimit -n
3937
-coverage run --omit="test/*" -m unittest --buffer
4038
-coverage report
41-
-if [ "$TRAVIS_PYTHON_VERSION" == '3.5' ]; then cd doc && make html; fi
39+
-if [ "$TRAVIS_PYTHON_VERSION" == '3.6' ]; then cd doc && make html; fi
4240
-if [ "$TRAVIS_PYTHON_VERSION" == '3.6' ]; then flake8 --ignore=W293,E265,E266,W503,W504,E731; fi
4341
after_success:
4442
-codecov

‎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.

‎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.

‎git/cmd.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
importsubprocess
1818
importsys
1919
importthreading
20-
fromcollectionsimportOrderedDict
2120
fromtextwrapimportdedent
22-
importwarnings
2321

2422
fromgit.compatimport (
2523
defenc,
@@ -1005,13 +1003,6 @@ def transform_kwarg(self, name: str, value: Any, split_single_char_options: bool
10051003

10061004
deftransform_kwargs(self,split_single_char_options:bool=True,**kwargs:Any)->List[str]:
10071005
"""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-
ifsys.version_info[:2]< (3,6):
1012-
kwargs=OrderedDict(sorted(kwargs.items(),key=lambdax: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.")
10151006
args= []
10161007
fork,vinkwargs.items():
10171008
ifisinstance(v, (list,tuple)):

‎setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def build_py_modules(basedir, excludes=[]):
9999
include_package_data=True,
100100
py_modules=build_py_modules("./git",excludes=["git.ext.*"]),
101101
package_dir={'git':'git'},
102-
python_requires='>=3.5',
102+
python_requires='>=3.6',
103103
install_requires=requirements,
104104
tests_require=requirements+test_requirements,
105105
zip_safe=False,
@@ -127,6 +127,6 @@ def build_py_modules(basedir, excludes=[]):
127127
"Programming Language :: Python :: 3.6",
128128
"Programming Language :: Python :: 3.7",
129129
"Programming Language :: Python :: 3.8",
130-
"Programming Language :: Python :: 3.9"
130+
"Programming Language :: Python :: 3.9"
131131
]
132132
)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp