Skip to content

docs: update the httpbin charm to jubilant - #1987

Merged
dimaqq merged 4 commits into
canonical:mainfrom
dimaqq:docs-use-jubilant-in-docs
Aug 18, 2025
Merged

dimaqq merged 4 commits into
canonical:mainfrom
dimaqq:docs-use-jubilant-in-docs

Conversation

@dimaqq

@dimaqq dimaqq commented Aug 13, 2025 •

Copy link
Copy Markdown
Contributor

Part of the series "let's get rid of python-libjuju and pytest-operator and use jubilant instead" across our codebase.

This PR updates the integration tests in the httpbin-demo example.

@dimaqq
dimaqq requested review from IronCore864 and dwilding August 13, 2025 07:47

@dwilding dwilding left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks a lot!

In addition to running the integration test, I verified that the new integration testing code would pass tox -e lint as defined in @tonyandrewmeyer's #1972 (once pytest and jubilant are added as deps).

Comment thread examples/httpbin-demo/charmcraft.yaml
Comment thread examples/httpbin-demo/tests/integration/test_charm.py
Comment thread examples/httpbin-demo/tests/integration/conftest.py Outdated
@dimaqq
dimaqq requested a review from benhoyt August 18, 2025 01:07
@dimaqq
dimaqq merged commit 736624c into canonical:main Aug 18, 2025
@dimaqq
dimaqq deleted the docs-use-jubilant-in-docs branch August 18, 2025 05:43
tonyandrewmeyer added a commit that referenced this pull request Oct 22, 2026
Backport of the move from pytest-operator and python-libjuju to
Jubilant, so that the 2.23 maintenance branch no longer depends on
either.

Cherry-picked from main, in order:
 * #1958 (smoke tests to jubilant-backports)
 * #1963 (drop the `juju` dependency and add Juju 4 to the smoke matrix)
 * #1987 (httpbin example charm)
 * #1988 (zero-to-hero tutorial and the k8s example charms)
 * #2000 and #2004 (how-to guides and the testing explanation)
 * #1998 (ignore Juju 4 on microk8s timeouts in the smoke matrix)
 * #2190 (Juju 4/stable rather than 4/beta in the smoke matrix)

Adjustments for the 2.x branch:

- The Python 3.8 and 3.9 environment markers that #1958 removed from
`pyproject.toml` are kept, as is the 20.04 base in the smoke test
parametrisation.
- The smoke tox env injects `ops-2.*.whl` rather than `ops-3.*.whl`.
- `uv.lock` was regenerated rather than merged, which drops
pytest-operator, python-libjuju, pytest-asyncio and their transitive
dependencies.
- The Jubilant intersphinx entry is in `docs/custom_conf.py`, since this
branch still has the older starter-pack layout.
- The tutorial's "review the final code" links stay on the
juju-sdk-tutorial-k8s repository, which is what the other chapters on
this branch link to.

---------

Co-authored-by: Dima Tisnek <dima.tisnek@canonical.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants