Skip to content

fix: Robust resource lookup for editable installs #6183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richtja merged 2 commits into from
Aug 13, 2025
Merged

fix: Robust resource lookup for editable installs #6183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f04bef6
fix: Robust resource lookup for editable installs
Jul 4, 2025
a2ea8b8
ci: Drop ubuntu 20.04 tasks and add ubuntu 24.04 instead
Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,25 +330,25 @@ jobs:
uses: actions/checkout@v4
- uses: ./.github/actions/version

version_task_ubuntu_22:
version_task_ubuntu_24:

name: Version task ubuntu:22.04
name: Version task ubuntu:24.04
runs-on: ubuntu-22.04
container:
image: ubuntu:22.04
image: ubuntu:24.04
steps:
- name: Install Python dependencies
run: apt update && apt -y install python3 python3-setuptools ca-certificates
- name: Check out repository code
uses: actions/checkout@v4
- uses: ./.github/actions/version

version_task_ubuntu_20:
version_task_ubuntu_22:

name: Version task ubuntu:20.04
name: Version task ubuntu:22.04
runs-on: ubuntu-22.04
container:
image: ubuntu:20.04
image: ubuntu:22.04
steps:
- name: Install Python dependencies
run: apt update && apt -y install python3 python3-setuptools ca-certificates
Expand Down Expand Up @@ -432,25 +432,25 @@ jobs:
uses: actions/checkout@v4
- uses: ./.github/actions/egg

egg_task_ubuntu_22:
egg_task_ubuntu_24:

name: Egg task ubuntu:22.04
name: Egg task ubuntu:24.04
runs-on: ubuntu-22.04
container:
image: ubuntu:22.04
image: ubuntu:24.04
steps:
- name: Install Python dependencies
run: apt update && apt -y install python3 python3-setuptools
- name: Check out repository code
uses: actions/checkout@v4
- uses: ./.github/actions/egg

egg_task_ubuntu_20:
egg_task_ubuntu_22:

name: Egg task ubuntu:20.04
name: Egg task ubuntu:22.04
runs-on: ubuntu-22.04
container:
image: ubuntu:20.04
image: ubuntu:22.04
steps:
- name: Install Python dependencies
run: apt update && apt -y install python3 python3-setuptools
Expand Down
9 changes: 4 additions & 5 deletions avocado/core/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
import json
import os
import re

from pkg_resources import resource_exists, resource_filename
from importlib.resources import files

from avocado.core.settings_dispatcher import SettingsDispatcher

Expand Down Expand Up @@ -415,9 +414,9 @@ def _prepare_base_dirs(self):
user_dir = os.environ["VIRTUAL_ENV"]

config_file_name = "avocado.conf"
config_pkg_base = os.path.join("etc", "avocado", config_file_name)
if resource_exists("avocado", config_pkg_base):
self._config_path_pkg = resource_filename("avocado", config_pkg_base)
conf_file = files("avocado") / "etc" / "avocado" / config_file_name
if conf_file.is_file():
self._config_path_pkg = str(conf_file)
else:
Comment thread
YvanY0 marked this conversation as resolved.
self._config_path_pkg = None
self._config_dir_system = os.path.join(cfg_dir, "avocado")
Expand Down
Loading