From ca0a371135212fb0340dfdce5cd581759952d190 Mon Sep 17 00:00:00 2001 From: Ajinkya Udgirkar Date: Wed, 9 Aug 2023 20:20:29 +0530 Subject: [PATCH] Fix failing devel --- src/ansible_compat/config.py | 6 ------ tox.ini | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/ansible_compat/config.py b/src/ansible_compat/config.py index 8c351125..cc28db9b 100644 --- a/src/ansible_compat/config.py +++ b/src/ansible_compat/config.py @@ -17,12 +17,6 @@ # do not use lru_cache here, as environment can change between calls def ansible_collections_path() -> str: """Return collection path variable for current version of Ansible.""" - for env_var in [ - "ANSIBLE_COLLECTIONS_PATH", - "ANSIBLE_COLLECTIONS_PATHS", - ]: - if env_var in os.environ: - return env_var return "ANSIBLE_COLLECTIONS_PATH" diff --git a/tox.ini b/tox.ini index 1d3e47eb..5d814f90 100644 --- a/tox.ini +++ b/tox.ini @@ -27,7 +27,7 @@ deps = ansible214: ansible-core>=2.14,<2.15 ansible215: ansible-core>=2.15,<2.16 - devel: ansible-core @ git+https://github.com/ansible/ansible.git@c5d18c39d81e2b3b10856b2fb76747230e4fac4a # GPLv3+ + devel: ansible-core @ git+https://github.com/ansible/ansible.git # GPLv3+ # avoid installing ansible-core on -devel envs: !devel: ansible-core extras =