Skip to content

Commit e914842

Browse files
Merge pull request #149 from pypa/appveyor
Appveyor fixes
2 parents 81fce1f + a0290b0 commit e914842

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

appveyor.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
environment:
22
matrix:
33
- PYTHON: "C:\\Python27"
4-
TOX_ENV: "py27"
4+
TOX_ENV: "py-test"
55

66
- PYTHON: "C:\\Python27-x64"
7-
TOX_ENV: "py27"
7+
TOX_ENV: "py-test"
88

99
- PYTHON: "C:\\Python33"
10-
TOX_ENV: "py33"
10+
TOX_ENV: "py-test"
1111

1212
- PYTHON: "C:\\Python33-x64"
13-
TOX_ENV: "py33"
13+
TOX_ENV: "py-test"
1414

1515
- PYTHON: "C:\\Python34"
16-
TOX_ENV: "py34"
16+
TOX_ENV: "py-test"
1717

1818
- PYTHON: "C:\\Python34-x64"
19-
TOX_ENV: "py34"
19+
TOX_ENV: "py-test"
2020

2121
init:
2222
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"

testing/test_basic_api.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ def test_root_parameter_creation(monkeypatch):
4545
setuptools_scm.get_version()
4646

4747

48-
def test_root_parameter_pass_by(monkeypatch):
49-
assert_root(monkeypatch, '/tmp')
50-
setuptools_scm.get_version(root='/tmp')
48+
def test_root_parameter_pass_by(monkeypatch, tmpdir):
49+
assert_root(monkeypatch, tmpdir)
50+
setuptools_scm.get_version(root=tmpdir.strpath)
5151

5252

5353
def test_pretended(monkeypatch):
@@ -56,9 +56,9 @@ def test_pretended(monkeypatch):
5656
assert setuptools_scm.get_version() == pretense
5757

5858

59-
def test_root_relative_to(monkeypatch):
60-
assert_root(monkeypatch, '/tmp/alt')
61-
__file__ = '/tmp/module/file.py'
59+
def test_root_relative_to(monkeypatch, tmpdir):
60+
assert_root(monkeypatch, tmpdir.join('alt').strpath)
61+
__file__ = tmpdir.join('module/file.py').strpath
6262
setuptools_scm.get_version(root='../alt', relative_to=__file__)
6363

6464

0 commit comments

Comments
 (0)