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

Sgmoore/kde neon qt6 #5236

Open
wants to merge 20 commits into
base: main
Choose a base branch
from

Conversation

ScarlettGatelyMoore
Copy link
Contributor

  • [ x] Have you followed the guidelines for contributing?
  • [x ] Have you signed the CLA?
  • [x ] Have you successfully run tox run -m lint?
  • [x ] Have you successfully run tox run -e test-py310? (supported versions: py39, py310, py311, py312)

This is for a standalone kde-qt6 content pack support.

@ScarlettGatelyMoore
Copy link
Contributor Author

@mr-cal @lengau @sergiusens If you could please take a look, Thanks

Copy link
Contributor

@bepri bepri left a comment

Choose a reason for hiding this comment

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

Thanks Scarlett!

extensions/desktop/kde-neon-qt6/launcher-specific Outdated Show resolved Hide resolved
schema/snapcraft.json Outdated Show resolved Hide resolved
snapcraft/extensions/kde_neon_qt6.py Outdated Show resolved Hide resolved
Copy link

codecov bot commented Feb 8, 2025

Codecov Report

Attention: Patch coverage is 96.29630% with 3 lines in your changes missing coverage. Please review.

Project coverage is 89.73%. Comparing base (654871d) to head (8c85fde).
Report is 698 commits behind head on main.

Files with missing lines Patch % Lines
snapcraft/extensions/kde_neon_qt6.py 96.25% 3 Missing ⚠️

❗ There is a different number of reports uploaded between BASE (654871d) and HEAD (8c85fde). Click for more details.

HEAD has 1 upload less than BASE
Flag BASE (654871d) HEAD (8c85fde)
2 1
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5236      +/-   ##
==========================================
- Coverage   94.88%   89.73%   -5.16%     
==========================================
  Files         658      343     -315     
  Lines       55189    22717   -32472     
==========================================
- Hits        52364    20384   -31980     
+ Misses       2825     2333     -492     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ScarlettGatelyMoore
Copy link
Contributor Author

I need help with ruff

ruff failed
Cause: TOML parse error at line 49, column 1
|
49 | lint.select = [
| ^^^^
unknown field lint, expected one of allowed-confusables, builtins, cache-dir, dummy-variable-rgx, exclude, extend, extend-exclude, extend-include, extend-ignore, extend-select, extend-fixable, extend-unfixable, external, fix, fix-only, fixable, output-format, force-exclude, ignore, ignore-init-module-imports, include, line-length, tab-size, logger-objects, required-version, respect-gitignore, select, show-source, show-fixes, src, namespace-packages, target-version, preview, task-tags, typing-modules, unfixable, flake8-annotations, flake8-bandit, flake8-bugbear, flake8-builtins, flake8-comprehensions, flake8-copyright, flake8-errmsg, flake8-quotes, flake8-self, flake8-tidy-imports, flake8-type-checking, flake8-gettext, flake8-implicit-str-concat, flake8-import-conventions, flake8-pytest-style, flake8-unused-arguments, isort, mccabe, pep8-naming, pycodestyle, pydocstyle, pyflakes, pylint, pyupgrade, format, per-file-ignores, extend-per-file-ignores

lint-ruff: exit 2 (0.00 seconds) /home/scarlett/ubuntu-core/snapcraft> ruff check --diff --respect-gitignore pid=51463
lint-ruff: FAIL ✖ in 0.36 seconds

It is outside my code and don't want to touch it.

pyproject.toml: 1
49: 1: lint.select = [
snapcraft_legacy/ruff.toml: 1
15: 1: lint.select = [

@ScarlettGatelyMoore
Copy link
Contributor Author

Seems my local tests have different results. ruff wants me to remove the else on build environment exports and doing so breaks everything. Advice welcome.

@mr-cal
Copy link
Collaborator

mr-cal commented Feb 10, 2025

@ScarlettGatelyMoore - what version of ruff do you have (ruff --version). It looks like the ruff snap was updated on the 7th, something may have broken or there is a mismatch between what you have locally and CI.

That formatting in snapcraft/extensions/kde_neon_qt6.py looks like it's trying to do:

if ...:
    return ...
else:
    return ...

to

if ...:
    return ...
return ...

That seems like the same logic to me, with or without the else.

@ScarlettGatelyMoore
Copy link
Contributor Author

@ScarlettGatelyMoore - what version of ruff do you have (ruff --version). It looks like the ruff snap was updated on the 7th, something may have broken or there is a mismatch between what you have locally and CI.

That formatting in snapcraft/extensions/kde_neon_qt6.py looks like it's trying to do:

if ...:
    return ...
else:
    return ...

to

if ...:
    return ...
return ...

That seems like the same logic to me, with or without the else.

Not sure why it broke pytest when I did it then. I will give it another go. Thanks!

@ScarlettGatelyMoore
Copy link
Contributor Author

Ok success, spread tests will not pass until the store approves kde-qt6-core24 name so I can upload... if any canonical folks know who to poke it would be super helpful. Thanks

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