Skip to content

Commit

Permalink
Pin pytest<5
Browse files Browse the repository at this point in the history
Signed-off-by: Dan Ryan <dan@danryan.co>
  • Loading branch information
techalchemy committed Jul 6, 2019
1 parent 8abaa06 commit 1630da8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"parver",
"invoke",
],
"tests": ["pytest", "pytest-tap", "pytest-xdist", "flaky", "mock"],
"tests": ["pytest<5.0", "pytest-tap", "pytest-xdist", "flaky", "mock"],
}

# https://pypi.python.org/pypi/stdeb/0.8.5#quickstart-2-just-tell-me-the-fastest-way-to-make-a-deb
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/test_install_uri.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ def test_local_vcs_urls_work(PipenvInstance, tmpdir):
@pytest.mark.vcs
@pytest.mark.install
@pytest.mark.needs_internet
def test_editable_vcs_install(PipenvInstance_NoPyPI): # ! This is failing
def test_editable_vcs_install(PipenvInstance_NoPyPI):
with PipenvInstance_NoPyPI(chdir=True) as p:
c = p.pipenv(
"install -e git+https://github.com/kennethreitz/requests.git#egg=requests --verbose"
"install -e git+https://github.com/kennethreitz/requests.git#egg=requests"
)
assert c.return_code == 0
assert "requests" in p.pipfile["packages"]
Expand All @@ -145,12 +145,12 @@ def test_editable_vcs_install(PipenvInstance_NoPyPI): # ! This is failing
@pytest.mark.tablib
@pytest.mark.install
@pytest.mark.needs_internet
def test_install_editable_git_tag(PipenvInstance_NoPyPI): # ! This is failing
def test_install_editable_git_tag(PipenvInstance_NoPyPI):
# This uses the real PyPI since we need Internet to access the Git
# dependency anyway.
with PipenvInstance_NoPyPI(chdir=True) as p:
c = p.pipenv(
"install -e git+https://github.com/benjaminp/six.git@1.11.0#egg=six --verbose"
"install -e git+https://github.com/benjaminp/six.git@1.11.0#egg=six"
)
assert c.return_code == 0
assert "six" in p.pipfile["packages"]
Expand Down Expand Up @@ -209,10 +209,10 @@ def test_install_local_vcs_not_in_lockfile(PipenvInstance):
@pytest.mark.vcs
@pytest.mark.install
@pytest.mark.needs_internet
def test_get_vcs_refs(PipenvInstance_NoPyPI): # ! this is failing
def test_get_vcs_refs(PipenvInstance_NoPyPI):
with PipenvInstance_NoPyPI(chdir=True) as p:
c = p.pipenv(
"install -e git+https://github.com/benjaminp/six.git@1.9.0#egg=six --verbose"
"install -e git+https://github.com/benjaminp/six.git@1.9.0#egg=six"
)
assert c.return_code == 0
assert "six" in p.pipfile["packages"]
Expand Down

0 comments on commit 1630da8

Please sign in to comment.