Skip to content

Commit fed45a6

Browse files
authored
Merge pull request #165 from tomato42/six-version
six: expect specific version
2 parents 307d60e + 6c4f8cb commit fed45a6

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ matrix:
1515
env: TOX_ENV=py26
1616
- python: 2.7
1717
env: TOX_ENV=py27
18+
- python: 2.7
19+
env: TOX_ENV=py27_old_six
1820
- python: 3.3
1921
env: TOX_ENV=py33
2022
- python: 3.4

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@
4040
"Programming Language :: Python :: 3.7",
4141
"Programming Language :: Python :: 3.8",
4242
],
43-
install_requires=['six'],
43+
install_requires=['six>=1.9.0'],
4444
)

tox.ini

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,19 @@ deps =
1212
py{26}: hypothesis<3
1313
py{26,27,34,35,36,37,38,py,py3}: pytest
1414
py{27,34,35,36,37,38,py,py3}: hypothesis
15+
# six==1.9.0 comes from setup.py install_requires
16+
py27_old_six: six==1.9.0
17+
py27_old_six: pytest
18+
py27_old_six: hypothesis
1519
py: pytest
1620
py: hypothesis
1721
py{33}: wheel<0.30
1822
coverage
1923
commands = coverage run --branch -m pytest {posargs:src/ecdsa}
2024

25+
[testenv:py27_old_six]
26+
basepython = python2.7
27+
2128
[testenv:coverage]
2229
sitepackages=True
2330
commands = coverage run --branch -m pytest --hypothesis-show-statistics {posargs:src/ecdsa}

0 commit comments

Comments
 (0)