Skip to content
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.

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

Fix juju config directory location pointed by XDG_DATA_HOME #975

Merged
merged 3 commits into from
Oct 26, 2023

Conversation

cderici
Copy link
Contributor

@cderici cderici commented Oct 26, 2023

Description

XDG_DATA_HOME is supposed to point to the parent directory for applications. We were incorrectly setting that as Juju config dir.

QA Steps

No operational logic changes. All CI tests need to pass.

Notes & Discussions

Thanks @jameinel for pointing this out!

XDG_DATA_HOME is supposed to point to the parent directory for
applications. We were incorrectly setting that as Juju config dir.
@cderici cderici added hint/2.9 going on 2.9 branch area/forward-port to be forward ported - remove label after port labels Oct 26, 2023
@cderici cderici requested a review from jack-w-shaw October 26, 2023 14:28
juju/utils.py Outdated Show resolved Hide resolved
Copy link
Member

@jack-w-shaw jack-w-shaw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cderici
Copy link
Contributor Author

cderici commented Oct 26, 2023

/merge

@jujubot jujubot merged commit 1e341f7 into juju:2.9 Oct 26, 2023
@cderici cderici removed the area/forward-port to be forward ported - remove label after port label Oct 26, 2023
jujubot added a commit that referenced this pull request Oct 26, 2023
#976

#### Description

Forward port of #975 

XDG_DATA_HOME is supposed to point to the parent directory for applications. We were incorrectly setting that as Juju config dir.

#### QA Steps

No operational logic changes. There's one CI failure on the master branch about add manual machine ssh that's unrelated to this change, that one's aside, all the others need to be passing.
@cderici cderici mentioned this pull request Oct 26, 2023
jujubot added a commit that referenced this pull request Oct 26, 2023
#979

## What's Changed
* Deploy by revision on 2.9 by @cderici in #957
* Application refresh with resources by @cderici in #960
* Improve jujudata to find controller name by endpoint by @cderici in #964
* Allow switch kwarg in refresh to switch to local charms by @jack-w-shaw in #968
* Parse charm URLs consistantly for local charms by @jack-w-shaw in #969
* Fix juju config directory location pointed by XDG_DATA_HOME by @cderici in #975
* [JUJU-4779] Switch to local properly by @jack-w-shaw in #977

#### Notes & Discussion

JUJU-4850

[JUJU-4779]: https://warthogs.atlassian.net/browse/JUJU-4779?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
jujubot added a commit that referenced this pull request Jan 9, 2024
#993

#### Description

The walrus operator (`:=`) was introduced in Python 3.8, the use of it in the `2.9` branch breaks python 3.6 compatibility which is the version used in Ubuntu 18.04 (Bionic).

https://docs.python.org/3/whatsnew/3.8.html#assignment-expressions

#### QA Steps

1. Install python-libjuju in python 3.6
2. python3 -c "import juju.utils"

```
virtualenv -p /usr/bin/python3.6 /tmp/myvenv
source /tmp/myvenv/bin/activate
python3 setup.py install
python3 -c "import juju.utils"
```

All CI tests need to pass.

#### Notes & Discussion

This regression was introduced by #975
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hint/2.9 going on 2.9 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants