Skip to content

P
python-poetry
Commit 95e3490a by Arun Babu Neelicattu Committed by GitHub
Options

Update importlib-metadata, virtualenv and keyring dependency package (#2320)

parent d09cfce7
Showing with 35 additions and 11 deletions
pyproject.toml
...@@ -44,16 +44,17 @@ pathlib2 = { version = "^2.3", python = "~2.7" } ...@@ -44,16 +44,17 @@ pathlib2 = { version = "^2.3", python = "~2.7" }
# Use glob2 for Python 2.7 and 3.4 # Use glob2 for Python 2.7 and 3.4
glob2 = { version = "^0.6", python = "~2.7" } glob2 = { version = "^0.6", python = "~2.7" }
# Use virtualenv for Python 2.7 since venv does not exist # Use virtualenv for Python 2.7 since venv does not exist
virtualenv = { version = "^16.7.9", python = "~2.7" } virtualenv = { version = "^20.0.18", python = "~2.7" }
# functools32 is needed for Python 2.7 # functools32 is needed for Python 2.7
functools32 = { version = "^3.2.3", python = "~2.7" } functools32 = { version = "^3.2.3", python = "~2.7" }
keyring = [ keyring = [
{ version = "^18.0.1", python = "~2.7" }, { version = "^18.0.1", python = "~2.7" },
{ version = "^20.0.1", python = "^3.5" } { version = "^20.0.1", python = "~3.5" },
{ version = "^21.2.0", python = "^3.6" }
] ]
# Use subprocess32 for Python 2.7 # Use subprocess32 for Python 2.7
subprocess32 = { version = "^3.5", python = "~2.7" } subprocess32 = { version = "^3.5", python = "~2.7" }
importlib-metadata = {version = "~1.1.3", python = "<3.8"} importlib-metadata = {version = "^1.6.0", python = "<3.8"}
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
pytest = "^4.1" pytest = "^4.1"
......
tests/conftest.py
...@@ -117,3 +117,18 @@ def tmp_dir(): ...@@ -117,3 +117,18 @@ def tmp_dir():
yield dir_ yield dir_
shutil.rmtree(dir_) shutil.rmtree(dir_)
@pytest.fixture
def mocked_open_files(mocker):
files = []
original = Path.open
def mocked_open(self, *args, **kwargs):
if self.name in {"pyproject.toml"}:
return mocker.MagicMock()
return original(self, *args, **kwargs)
mocker.patch("poetry.utils._compat.Path.open", mocked_open)
yield files
tests/console/commands/test_init.py
...@@ -137,14 +137,16 @@ python = "^{python}" ...@@ -137,14 +137,16 @@ python = "^{python}"
assert expected in tester.io.fetch_output() assert expected in tester.io.fetch_output()
def test_interactive_with_git_dependencies(app, repo, mocker, poetry): def test_interactive_with_git_dependencies(
app, repo, mocker, poetry, mocked_open_files
):
repo.add_package(get_package("pendulum", "2.0.0")) repo.add_package(get_package("pendulum", "2.0.0"))
repo.add_package(get_package("pytest", "3.6.0")) repo.add_package(get_package("pytest", "3.6.0"))
command = app.find("init") command = app.find("init")
command._pool = poetry.pool command._pool = poetry.pool
mocker.patch("poetry.utils._compat.Path.open") mocked_open_files.append("pyproject.toml")
p = mocker.patch("poetry.utils._compat.Path.cwd") p = mocker.patch("poetry.utils._compat.Path.cwd")
p.return_value = Path(__file__).parent p.return_value = Path(__file__).parent
...@@ -187,14 +189,16 @@ pytest = "^3.6.0" ...@@ -187,14 +189,16 @@ pytest = "^3.6.0"
assert expected in tester.io.fetch_output() assert expected in tester.io.fetch_output()
def test_interactive_with_git_dependencies_with_reference(app, repo, mocker, poetry): def test_interactive_with_git_dependencies_with_reference(
app, repo, mocker, poetry, mocked_open_files
):
repo.add_package(get_package("pendulum", "2.0.0")) repo.add_package(get_package("pendulum", "2.0.0"))
repo.add_package(get_package("pytest", "3.6.0")) repo.add_package(get_package("pytest", "3.6.0"))
command = app.find("init") command = app.find("init")
command._pool = poetry.pool command._pool = poetry.pool
mocker.patch("poetry.utils._compat.Path.open") mocked_open_files.append("pyproject.toml")
p = mocker.patch("poetry.utils._compat.Path.cwd") p = mocker.patch("poetry.utils._compat.Path.cwd")
p.return_value = Path(__file__).parent p.return_value = Path(__file__).parent
...@@ -237,14 +241,16 @@ pytest = "^3.6.0" ...@@ -237,14 +241,16 @@ pytest = "^3.6.0"
assert expected in tester.io.fetch_output() assert expected in tester.io.fetch_output()
def test_interactive_with_git_dependencies_and_other_name(app, repo, mocker, poetry): def test_interactive_with_git_dependencies_and_other_name(
app, repo, mocker, poetry, mocked_open_files
):
repo.add_package(get_package("pendulum", "2.0.0")) repo.add_package(get_package("pendulum", "2.0.0"))
repo.add_package(get_package("pytest", "3.6.0")) repo.add_package(get_package("pytest", "3.6.0"))
command = app.find("init") command = app.find("init")
command._pool = poetry.pool command._pool = poetry.pool
mocker.patch("poetry.utils._compat.Path.open") mocked_open_files.append("pyproject.toml")
p = mocker.patch("poetry.utils._compat.Path.cwd") p = mocker.patch("poetry.utils._compat.Path.cwd")
p.return_value = Path(__file__).parent p.return_value = Path(__file__).parent
...@@ -287,14 +293,16 @@ pytest = "^3.6.0" ...@@ -287,14 +293,16 @@ pytest = "^3.6.0"
assert expected in tester.io.fetch_output() assert expected in tester.io.fetch_output()
def test_interactive_with_directory_dependency(app, repo, mocker, poetry): def test_interactive_with_directory_dependency(
app, repo, mocker, poetry, mocked_open_files
):
repo.add_package(get_package("pendulum", "2.0.0")) repo.add_package(get_package("pendulum", "2.0.0"))
repo.add_package(get_package("pytest", "3.6.0")) repo.add_package(get_package("pytest", "3.6.0"))
command = app.find("init") command = app.find("init")
command._pool = poetry.pool command._pool = poetry.pool
mocker.patch("poetry.utils._compat.Path.open") mocked_open_files.append("pyproject.toml")
p = mocker.patch("poetry.utils._compat.Path.cwd") p = mocker.patch("poetry.utils._compat.Path.cwd")
p.return_value = Path(__file__).parent p.return_value = Path(__file__).parent
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment