10
9
Fork
You've already forked linux-app
14

Simplify installation prefix detection #669

Open
a-andre wants to merge 1 commit from a-andre/linux-app:resource into master
pull from: a-andre/linux-app:resource
merge into: eduVPN:master
eduVPN:master
eduVPN:upstream-deb
eduVPN:openvpn-persistent
eduVPN:1.x
Contributor
Copy link
No description provided.
setup.cfg Outdated
@ -31,6 +31,7 @@ packages =
python_requires = >= 3.6
install_requires =
eduvpn_common >= 4.0.0,< 5.0.0
importlib_resources;python_version<'3.10'

tbh, I think we should just drop support for python < 3.10

the minimum version is 3.10 because of ubuntu 22.04

tbh, I think we should just drop support for python < 3.10 the minimum version is 3.10 because of ubuntu 22.04
Author
Contributor
Copy link

See #670.

See #670.
a-andre marked this conversation as resolved
eduvpn/utils.py Outdated
@ -160,3 +156,1 @@
if path.isfile(path.join(option, target)):
return option
raise Exception("Can't find eduVPN installation")
return str(importlib.resources.files('eduvpn') / 'data')

does this all work for the deb, rpm and pip packages? What if you have eduvpn installed with both pip and deb/rpm?

does this all work for the deb, rpm and pip packages? What if you have eduvpn installed with both pip and deb/rpm?
Author
Contributor
Copy link

does this all work for the deb, rpm and pip packages?

yes

What if you have eduvpn installed with both pip and deb/rpm?

This should not be a problem. Like importing an eduvpn module is not a problem if it is installed with both. Because the module import and the resource import are based on the same system. To quote from https://docs.python.org/3/library/importlib.resources.html

This module leverages Python’s import system to provide access to resources within packages.

> does this all work for the deb, rpm and pip packages? yes > What if you have eduvpn installed with both pip and deb/rpm? This should not be a problem. Like importing an eduvpn module is not a problem if it is installed with both. Because the module import and the resource import are based on the same system. To quote from https://docs.python.org/3/library/importlib.resources.html > This module leverages Python’s import system to provide access to resources within packages.
a-andre changed title from (削除) Simplify installation prefix detection (削除ここまで) to WIP: Simplify installation prefix detection 2025年11月08日 00:14:19 +01:00

This can be rebased now

This can be rebased now
a-andre changed title from (削除) WIP: Simplify installation prefix detection (削除ここまで) to Simplify installation prefix detection 2026年07月03日 23:41:55 +02:00
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u resource:a-andre-resource
git switch a-andre-resource

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff a-andre-resource
git switch a-andre-resource
git rebase master
git switch master
git merge --ff-only a-andre-resource
git switch a-andre-resource
git rebase master
git switch master
git merge --no-ff a-andre-resource
git switch master
git merge --squash a-andre-resource
git switch master
git merge --ff-only a-andre-resource
git switch master
git merge a-andre-resource
git push origin master
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
eduVPN/linux-app!669
Reference in a new issue
eduVPN/linux-app
No description provided.
Delete branch "a-andre/linux-app:resource"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?