From 0e7b0eb83b4d6abf1711c268d80d1d316c1c9242 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Mon, 22 Jan 2024 17:20:22 +0000 Subject: [PATCH] Extend .venv paths to ignore Useful when creating virtual environments for several Python versions (e.g. `.venv38`, `.venv312`), which otherwise are linted by tools like black, isort and flake8. --- .ci/flake8_ignorelist.txt | 3 +-- .gitignore | 3 +-- test/unit/app/test_galaxy_install.py | 11 ++++++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.ci/flake8_ignorelist.txt b/.ci/flake8_ignorelist.txt index d4ced27b5b8d..9676f9673689 100644 --- a/.ci/flake8_ignorelist.txt +++ b/.ci/flake8_ignorelist.txt @@ -1,7 +1,6 @@ .git .tox -.venv -.venv3 +.venv* packages/*/.venv packages/*/build packages/*/dist diff --git a/.gitignore b/.gitignore index fd3864c71cd2..b4620da918eb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,7 @@ scripts/scramble/lib scripts/scramble/archives # Python virtualenv -.venv -.venv3 +.venv*/ # Python build artifacts build diff --git a/test/unit/app/test_galaxy_install.py b/test/unit/app/test_galaxy_install.py index 13ef2a5e81e4..021bfdfd12ec 100644 --- a/test/unit/app/test_galaxy_install.py +++ b/test/unit/app/test_galaxy_install.py @@ -38,7 +38,16 @@ def test_against_production_shed(tmp_path: Path): assert tool_guid in f.read() repo_path = tmp_path / "tools" / "toolshed.g2.bx.psu.edu" / "repos" / repo_owner / repo_name / repo_revision assert repo_path.exists() - tool_data_table_path = tmp_path / "tool_data" / "toolshed.g2.bx.psu.edu" / "repos" / repo_owner / repo_name / repo_revision / "tool_data_table_conf.xml" + tool_data_table_path = ( + tmp_path + / "tool_data" + / "toolshed.g2.bx.psu.edu" + / "repos" + / repo_owner + / repo_name + / repo_revision + / "tool_data_table_conf.xml" + ) assert tool_data_table_path.exists() install_model_context = install_target.install_model.context