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

plugins: qmake #463

Merged
merged 43 commits into from
Dec 19, 2023
Merged

Conversation

ScarlettGatelyMoore
Copy link
Contributor

@ScarlettGatelyMoore ScarlettGatelyMoore commented May 24, 2023

  • Have you signed the CLA?

I ran the make tests - but I am going to be honest and couldn't get past the ruff test. It wanted me to change a bunch of files that don't belong to me.

Copy link
Contributor

@lengau lengau left a comment

Choose a reason for hiding this comment

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

Thanks @ScarlettGatelyMoore, this looks great! I'd like @cmatsuoka to review this too since he's much more familiar with craft_parts than I am, but all my comments are pretty minor/nitpicky.

I've also enabled the CI runners here for tests and stuff.

craft_parts/plugins/qmake_plugin.py Outdated Show resolved Hide resolved
craft_parts/plugins/qmake_plugin.py Show resolved Hide resolved
tests/unit/plugins/test_qmake_plugin.py Outdated Show resolved Hide resolved
@lengau lengau requested a review from cmatsuoka May 25, 2023 17:20
@lengau
Copy link
Contributor

lengau commented May 25, 2023

@ScarlettGatelyMoore I'll take a look at the ruff stuff - it's probably due to problems with the configuration I made + ruff not being stable yet

lengau and others added 3 commits May 25, 2023 13:25
Co-authored-by: Alex Lowe <alex.lowe@canonical.com>
Co-authored-by: Alex Lowe <alex.lowe@canonical.com>
@ScarlettGatelyMoore
Copy link
Contributor Author

Great, Thanks!

@lengau
Copy link
Contributor

lengau commented May 25, 2023

I made a PR to your branch that fixes the linting issues on my machine (and presumably in CI): ScarlettGatelyMoore#1

I think it'll fix the pytest import error too

@ScarlettGatelyMoore
Copy link
Contributor Author

Who do I need to poke to get these workflows approved?

@ghost
Copy link

ghost commented Aug 5, 2023

@lengau @ScarlettGatelyMoore Any progress on this or any targeted release ?

@ScarlettGatelyMoore
Copy link
Contributor Author

@lengau @ScarlettGatelyMoore Any progress on this or any targeted release ?

I got stuck and then time got away from me. I will take a look again this week. Or if another set of eyes can take a look, I don't oppose help.

@ScarlettGatelyMoore
Copy link
Contributor Author

I made progress on this. The tests pass now except pyright fails on a bunch of doc type failures and are unrelated to this.

@lengau lengau self-requested a review August 18, 2023 13:42
craft_parts/plugins/qmake_plugin.py Outdated Show resolved Hide resolved
craft_parts/plugins/qmake_plugin.py Outdated Show resolved Hide resolved
craft_parts/plugins/qmake_plugin.py Outdated Show resolved Hide resolved
craft_parts/plugins/qmake_plugin.py Outdated Show resolved Hide resolved
@lengau
Copy link
Contributor

lengau commented Nov 2, 2023

I've made a PR to your branch that should fix the relevant issues.

Copy link
Contributor

@lengau lengau left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for all the work on this!

@lengau lengau requested a review from cmatsuoka November 20, 2023 17:56
Copy link
Collaborator

@cmatsuoka cmatsuoka 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 and Alex! L.et's land this on main and test it -- if everything looks fine we can backport it to 1.x

@cmatsuoka cmatsuoka merged commit 641edb5 into canonical:main Dec 19, 2023
7 checks passed
linostar pushed a commit to linostar/craft-parts that referenced this pull request Jan 2, 2024
Add support to qmake projects.
syu-w referenced this pull request in canonical/charmcraft Mar 12, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [craft-parts](https://github.com/canonical/craft-parts) | `==1.26.2`
-> `==1.27.0` |
[![age](https://developer.mend.io/api/mc/badges/age/pypi/craft-parts/1.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/pypi/craft-parts/1.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/pypi/craft-parts/1.26.2/1.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/craft-parts/1.26.2/1.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>canonical/craft-parts (craft-parts)</summary>

###
[`v1.27.0`](https://github.com/canonical/craft-parts/releases/tag/1.27.0)

[Compare
Source](https://github.com/canonical/craft-parts/compare/1.26.2...1.27.0)

##### What's Changed

- chore(linter): enable ruff base on starbase config by
[@&#8203;syu-w](https://github.com/syu-w) in
[https://github.com/canonical/craft-parts/pull/580](https://github.com/canonical/craft-parts/pull/580)
- chore(linter): ruff auto fix base on starbase config by
[@&#8203;syu-w](https://github.com/syu-w) in
[https://github.com/canonical/craft-parts/pull/581](https://github.com/canonical/craft-parts/pull/581)
- chore(deps): update dependency pyright to v1.1.337 by
[@&#8203;renovate](https://github.com/renovate) in
[https://github.com/canonical/craft-parts/pull/588](https://github.com/canonical/craft-parts/pull/588)
- chore(linter): misc fixes by
[@&#8203;syu-w](https://github.com/syu-w) in
[https://github.com/canonical/craft-parts/pull/585](https://github.com/canonical/craft-parts/pull/585)
- feat(info): add base layer data to ProjectInfo by
[@&#8203;tigarmo](https://github.com/tigarmo) in
[https://github.com/canonical/craft-parts/pull/594](https://github.com/canonical/craft-parts/pull/594)
- docs: add rockcraft chisel notes by
[@&#8203;syu-w](https://github.com/syu-w) in
[https://github.com/canonical/craft-parts/pull/587](https://github.com/canonical/craft-parts/pull/587)
- chore(deps): update actions/setup-node action to v4 by
[@&#8203;renovate](https://github.com/renovate) in
[https://github.com/canonical/craft-parts/pull/586](https://github.com/canonical/craft-parts/pull/586)
- chore(deps): update documentation dependencies by
[@&#8203;renovate](https://github.com/renovate) in
[https://github.com/canonical/craft-parts/pull/591](https://github.com/canonical/craft-parts/pull/591)
- chore(deps): disable renovate on things we can't update by
[@&#8203;lengau](https://github.com/lengau) in
[https://github.com/canonical/craft-parts/pull/606](https://github.com/canonical/craft-parts/pull/606)
- chore(deps): loosen mypy requirement by
[@&#8203;lengau](https://github.com/lengau) in
[https://github.com/canonical/craft-parts/pull/604](https://github.com/canonical/craft-parts/pull/604)
- chore(deps): prevent renovate from updating types-requests by
[@&#8203;lengau](https://github.com/lengau) in
[https://github.com/canonical/craft-parts/pull/605](https://github.com/canonical/craft-parts/pull/605)
- docs: add note about plugin-specific properties by
[@&#8203;mr-cal](https://github.com/mr-cal) in
[https://github.com/canonical/craft-parts/pull/608](https://github.com/canonical/craft-parts/pull/608)
- plugins: qmake by
[@&#8203;ScarlettGatelyMoore](https://github.com/ScarlettGatelyMoore)
in
[https://github.com/canonical/craft-parts/pull/463](https://github.com/canonical/craft-parts/pull/463)
- plugins: ant: add proxy support by
[@&#8203;kubiko](https://github.com/kubiko) in
[https://github.com/canonical/craft-parts/pull/579](https://github.com/canonical/craft-parts/pull/579)
- test: make tests work in python 3.12+ by
[@&#8203;lengau](https://github.com/lengau) in
[https://github.com/canonical/craft-parts/pull/617](https://github.com/canonical/craft-parts/pull/617)
- chore(deps): update actions/setup-python action to v5 by
[@&#8203;renovate](https://github.com/renovate) in
[https://github.com/canonical/craft-parts/pull/615](https://github.com/canonical/craft-parts/pull/615)
- Merge 1.26.1 by [@&#8203;cmatsuoka](https://github.com/cmatsuoka) in
[https://github.com/canonical/craft-parts/pull/612](https://github.com/canonical/craft-parts/pull/612)
- chore(ci): update chisel by
[@&#8203;tigarmo](https://github.com/tigarmo) in
[https://github.com/canonical/craft-parts/pull/622](https://github.com/canonical/craft-parts/pull/622)
- test: use `new_dir` fixture by
[@&#8203;mr-cal](https://github.com/mr-cal) in
[https://github.com/canonical/craft-parts/pull/624](https://github.com/canonical/craft-parts/pull/624)
- build(deps): pin overrides!=7.6.0 by
[@&#8203;mr-cal](https://github.com/mr-cal) in
[https://github.com/canonical/craft-parts/pull/628](https://github.com/canonical/craft-parts/pull/628)
- fix(parts): set field defaults using default_factory by
[@&#8203;thp-canonical](https://github.com/thp-canonical) in
[https://github.com/canonical/craft-parts/pull/629](https://github.com/canonical/craft-parts/pull/629)
- feat(rust_plugin): use `rustup` snap and more options by
[@&#8203;liushuyu](https://github.com/liushuyu) in
[https://github.com/canonical/craft-parts/pull/626](https://github.com/canonical/craft-parts/pull/626)
- style: update to black 2024 by
[@&#8203;mr-cal](https://github.com/mr-cal) in
[https://github.com/canonical/craft-parts/pull/638](https://github.com/canonical/craft-parts/pull/638)
- chore(deps): update dependency ruff to v0.1.14 by
[@&#8203;renovate](https://github.com/renovate) in
[https://github.com/canonical/craft-parts/pull/589](https://github.com/canonical/craft-parts/pull/589)
- ci: update Chisel version again by
[@&#8203;tigarmo](https://github.com/tigarmo) in
[https://github.com/canonical/craft-parts/pull/642](https://github.com/canonical/craft-parts/pull/642)
- style: update pyright by [@&#8203;lengau](https://github.com/lengau)
in
[https://github.com/canonical/craft-parts/pull/639](https://github.com/canonical/craft-parts/pull/639)
- build: use tox for unit tests in CI by
[@&#8203;lengau](https://github.com/lengau) in
[https://github.com/canonical/craft-parts/pull/616](https://github.com/canonical/craft-parts/pull/616)
- ci: use GH/JIRA integration bot by
[@&#8203;sergiusens](https://github.com/sergiusens) in
[https://github.com/canonical/craft-parts/pull/658](https://github.com/canonical/craft-parts/pull/658)
- docs: Link filesets specification from part properties by
[@&#8203;thp-canonical](https://github.com/thp-canonical) in
[https://github.com/canonical/craft-parts/pull/654](https://github.com/canonical/craft-parts/pull/654)
- tests: use a path in the user's home directory for xattrs tests by
[@&#8203;lengau](https://github.com/lengau) in
[https://github.com/canonical/craft-parts/pull/678](https://github.com/canonical/craft-parts/pull/678)
- docs(plugins): add dump plugin docs by
[@&#8203;syu-w](https://github.com/syu-w) in
[https://github.com/canonical/craft-parts/pull/676](https://github.com/canonical/craft-parts/pull/676)
- chore(deps): update documentation dependencies by
[@&#8203;renovate](https://github.com/renovate) in
[https://github.com/canonical/craft-parts/pull/643](https://github.com/canonical/craft-parts/pull/643)
- chore(deps): update documentation dependencies (major) by
[@&#8203;renovate](https://github.com/renovate) in
[https://github.com/canonical/craft-parts/pull/644](https://github.com/canonical/craft-parts/pull/644)
- chore(linter): refine ruff configurations by
[@&#8203;liushuyu](https://github.com/liushuyu) in
[https://github.com/canonical/craft-parts/pull/651](https://github.com/canonical/craft-parts/pull/651)
- refactor(docs) move more docs to the shared base by
[@&#8203;tigarmo](https://github.com/tigarmo) in
[https://github.com/canonical/craft-parts/pull/680](https://github.com/canonical/craft-parts/pull/680)
- Merge 1.26.2 by [@&#8203;cmatsuoka](https://github.com/cmatsuoka) in
[https://github.com/canonical/craft-parts/pull/656](https://github.com/canonical/craft-parts/pull/656)
- Release 1.27.0 by [@&#8203;cmatsuoka](https://github.com/cmatsuoka)
in
[https://github.com/canonical/craft-parts/pull/681](https://github.com/canonical/craft-parts/pull/681)

##### New Contributors

-
[@&#8203;ScarlettGatelyMoore](https://github.com/ScarlettGatelyMoore)
made their first contribution in
[https://github.com/canonical/craft-parts/pull/463](https://github.com/canonical/craft-parts/pull/463)
- [@&#8203;kubiko](https://github.com/kubiko) made their first
contribution in
[https://github.com/canonical/craft-parts/pull/579](https://github.com/canonical/craft-parts/pull/579)
- [@&#8203;thp-canonical](https://github.com/thp-canonical) made their
first contribution in
[https://github.com/canonical/craft-parts/pull/629](https://github.com/canonical/craft-parts/pull/629)

**Full Changelog**:
canonical/craft-parts@1.26.2...1.27.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/canonical/charmcraft).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMzguMSIsInVwZGF0ZWRJblZlciI6IjM3LjIzOC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.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.

3 participants