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

Commita0a277d

Browse files
committed
Fix setup.py and use of requirements files.
1 parent7a6ca8c commita0a277d

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

‎git/cmd.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,8 @@ def refresh(cls, path=None):
220220
# - a GitCommandNotFound error is spawned by ourselves
221221
# - a PermissionError is spawned if the git executable provided
222222
# cannot be executed for whatever reason
223-
exceptions= (GitCommandNotFound,PermissionError)
223+
exceptions= (GitCommandNotFound,PermissionError)# noqa
224+
# (silence erroneous flake8 F821)
224225

225226
has_git=False
226227
try:

‎requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
gitdb>=0.6.4
2-
ddt>=1.1.1
1+
gitdb2 (>=2.0.0)

‎setup.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
withopen('requirements.txt')asreqs_file:
2020
requirements=reqs_file.read().splitlines()
2121

22+
withopen('test-requirements.txt')asreqs_file:
23+
test_requirements=reqs_file.read().splitlines()
24+
2225

2326
classbuild_py(_build_py):
2427

@@ -62,9 +65,6 @@ def _stamp_version(filename):
6265
else:
6366
print("WARNING: Couldn't find version line in file %s"%filename,file=sys.stderr)
6467

65-
66-
install_requires= ['gitdb2 >= 2.0.0']
67-
test_requires= ['ddt>=1.1.1']
6868
# end
6969

7070
setup(
@@ -81,9 +81,8 @@ def _stamp_version(filename):
8181
package_dir={'git':'git'},
8282
license="BSD License",
8383
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
84-
requires=['gitdb2 (>=2.0.0)'],
85-
install_requires=install_requires,
86-
test_requirements=test_requires+install_requires,
84+
requires=requirements,
85+
tests_require=requirements+test_requirements,
8786
zip_safe=False,
8887
long_description="""GitPython is a python library used to interact with Git repositories""",
8988
classifiers=[
@@ -110,6 +109,6 @@ def _stamp_version(filename):
110109
"Programming Language :: Python :: 3.4",
111110
"Programming Language :: Python :: 3.5",
112111
"Programming Language :: Python :: 3.6",
113-
"Programming Language :: Python :: 3.7",
112+
"Programming Language :: Python :: 3.7"
114113
]
115114
)

‎test-requirements.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
-r requirements.txt
2-
1+
ddt>=1.1.1
32
coverage
43
flake8
54
nose
6-
mock; python_version=='2.7'
5+
mock; python_version=='2.7'

0 commit comments

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