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

many: merge starbase/main #74

Merged
merged 90 commits into from
May 22, 2023
Merged

many: merge starbase/main #74

merged 90 commits into from
May 22, 2023

Conversation

tigarmo
Copy link
Collaborator

@tigarmo tigarmo commented May 22, 2023

The commit list is huge because this is bringing in the entirety of starbase/main; I think the important commits to look at are the last merge, done by me (most conflicts were solved by using the starbase version), and the handful of commits after that fixing linting issues.

lengau and others added 30 commits January 19, 2023 19:03
Most static checks don't need the code to be installed at all, but type checking can require the code and its dependencies.
tools: Make typing use an editable install
tests: Ensure coverage gets per-environment filenames
Done the same way as in rockcraft

Co-authored-by: Tiago Nobrega <tiago.nobrega@canonical.com>
docs: Basic sphinx docs
Rather than statically declaring the project to be "starcraft" all over the place, prefer excluding directories.
chore(tools): Make pyproject.toml exclude rather than statically include
chore(deps): update dependency tox to v4.4.2
chore(deps): update release-drafter/release-drafter action to v5.22.0
chore(deps): update dependency tox-ignore-env-name-mismatch to v0.2.0.post2
chore(deps): update dependency pytest to v7.2.1
Ensure that ruff only gets updated by renovate or explicitly in PRs. This will prevent random CI breakages until ruff is stable.
New ignore: Too many arguments on test functions

* chore(lint): Ruff autofixes for new pylint
renovate bot and others added 16 commits May 18, 2023 15:59
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Furo currently blocks us from updating to sphinx 7
pradyunsg/furo#653
Co-authored-by: Callahan <callahan.kovacs@canonical.com>
Signed-off-by: Callahan Kovacs <callahankovacs@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Otherwise it can pickup yml files from .git/remotes/...
@codecov
Copy link

codecov bot commented May 22, 2023

Codecov Report

Merging #74 (b23d3b3) into main (8874ce8) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main      #74   +/-   ##
=======================================
  Coverage   88.09%   88.09%           
=======================================
  Files          13       13           
  Lines         630      630           
  Branches      125      125           
=======================================
  Hits          555      555           
  Misses         61       61           
  Partials       14       14           

@tigarmo tigarmo marked this pull request as ready for review May 22, 2023 18:23
@tigarmo tigarmo changed the title Merge starbase many: merge starbase/main May 22, 2023
@tigarmo tigarmo requested a review from lengau May 22, 2023 18:25
@tigarmo tigarmo marked this pull request as draft May 22, 2023 18:34
@tigarmo
Copy link
Collaborator Author

tigarmo commented May 22, 2023

Leaving this as a Draft so we don't squash-merge by accident (needs to be a regular merge)

@lengau
Copy link
Collaborator

lengau commented May 22, 2023

Thanks for doing the heavy lifting for this! It looks great!

@tigarmo
Copy link
Collaborator Author

tigarmo commented May 22, 2023

It was actually surprisingly easy! About 15 minutes or so resolving the conflicts, and that's a price we'll only have to pay once (that's the hope anyway)

@tigarmo tigarmo merged commit b23d3b3 into main May 22, 2023
@tigarmo tigarmo deleted the merge-starbase branch May 22, 2023 20:12
@lengau
Copy link
Collaborator

lengau commented May 22, 2023

Oh good, in that case you can do this for snapcraft ;-)

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