FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix setup.py and use of requirements files. · gitpython-developers/GitPython@c045246 · GitHub

/ GitPython Public

Commit c045246

Browse files
jeking3
committed
Fix setup.py and use of requirements files.
1 parent 7a6ca8c commit c045246

8 files changed

Lines changed: 23 additions & 18 deletions

File tree

‎.appveyor.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ environment:
1616
- PYTHON: "C:\\Python35-x64"
1717
PYTHON_VERSION: "3.5"
1818
GIT_PATH: "%GIT_DAEMON_PATH%"
19+
- PYTHON: "C:\\Python36-x64"
20+
PYTHON_VERSION: "3.6"
21+
GIT_PATH: "%GIT_DAEMON_PATH%"
22+
- PYTHON: "C:\\Python37-x64"
23+
PYTHON_VERSION: "3.7"
24+
GIT_PATH: "%GIT_DAEMON_PATH%"
1925
- PYTHON: "C:\\Miniconda35-x64"
2026
PYTHON_VERSION: "3.5"
2127
IS_CONDA: "yes"
@@ -51,6 +57,7 @@ install:
5157
conda info -a &
5258
conda install --yes --quiet pip
5359
)
60+
- pip install -r requirements.txt
5461
- pip install -r test-requirements.txt
5562
- pip install codecov
5663

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ script:
4040
- ulimit -n 128
4141
- ulimit -n
4242
- nosetests -v --with-coverage
43-
- if [ "$TRAVIS_PYTHON_VERSION" == '3.4' ]; then flake8 --ignore=W293,E265,E266,W503,W504,E731; fi
4443
- if [ "$TRAVIS_PYTHON_VERSION" == '3.5' ]; then cd doc && make html; fi
45-
-
44+
- if [ "$TRAVIS_PYTHON_VERSION" == '3.6' ]; then flake8 --ignore=W293,E265,E266,W503,W504,E731; fi
4645
after_success:
4746
- codecov

‎MANIFEST.in‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ include VERSION
22
include LICENSE
33
include CHANGES
44
include AUTHORS
5-
include README
5+
include CONTRIBUTING.md
6+
include README.md
67
include requirements.txt
8+
include test-requirements.txt
79

810
recursive-include doc *
911

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ all:
22
@grep -Ee '^[a-z].*:' Makefile | cut -d: -f1 | grep -vF all
33

44
clean:
5-
rm -rf build/ dist/
5+
rm -rf build/ dist/ .eggs/ .tox/
66

77
release: clean
88
# Check if latest tag is the current head we're releasing

‎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 & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
with open('requirements.txt') as reqs_file:
2020
requirements = reqs_file.read().splitlines()
2121

22+
with open('test-requirements.txt') as reqs_file:
23+
test_requirements = reqs_file.read().splitlines()
24+
2225

2326
class build_py(_build_py):
2427

@@ -63,10 +66,6 @@ def _stamp_version(filename):
6366
print("WARNING: Couldn't find version line in file %s" % filename, file=sys.stderr)
6467

6568

66-
install_requires = ['gitdb2 >= 2.0.0']
67-
test_requires = ['ddt>=1.1.1']
68-
# end
69-
7069
setup(
7170
name="GitPython",
7271
cmdclass={'build_py': build_py, 'sdist': sdist},
@@ -81,9 +80,8 @@ def _stamp_version(filename):
8180
package_dir={'git': 'git'},
8281
license="BSD License",
8382
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,
83+
requires=requirements,
84+
tests_require=requirements + test_requirements,
8785
zip_safe=False,
8886
long_description="""GitPython is a python library used to interact with Git repositories""",
8987
classifiers=[
@@ -110,6 +108,6 @@ def _stamp_version(filename):
110108
"Programming Language :: Python :: 3.4",
111109
"Programming Language :: Python :: 3.5",
112110
"Programming Language :: Python :: 3.6",
113-
"Programming Language :: Python :: 3.7",
111+
"Programming Language :: Python :: 3.7"
114112
]
115113
)

‎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)
Back | FazBrowse Home | New Git URL