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

Restructure repository #1669

Merged
merged 16 commits into from
Nov 9, 2022
Merged

Restructure repository #1669

merged 16 commits into from
Nov 9, 2022

Conversation

mhsmith
Copy link
Member

@mhsmith mhsmith commented Nov 7, 2022

Fixes #1627.

I've kept most of the mechanical changes in the first two commits, so you can exclude those to see the interesting stuff.

I've reviewed all appearances of "src" and "../" in the repository, so hopefully I haven't missed anything. But I haven't touched release.sh, because it's no longer being used by CI, and if we can move to setuptools-scm then it'll no longer have any use at all and can be removed.

PR Checklist:

  • All new features have been tested
  • All new features have been documented
  • I have read the CONTRIBUTING.md file
  • I will abide by the code of conduct

Comment on lines -41 to -43
src/*/.tox
src/*/.coverage
src/*/.coverage.*
Copy link
Member Author

Choose a reason for hiding this comment

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

These 3 patterns are already listed above without any directory, so they don't need to be listed per-directory as well.

@mhsmith mhsmith marked this pull request as draft November 7, 2022 18:44
@mhsmith mhsmith marked this pull request as ready for review November 7, 2022 19:07
Copy link
Member

@freakboy3742 freakboy3742 left a comment

Choose a reason for hiding this comment

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

Looks good - high churn, but mostly uncontroversial stuff. I saw a couple of minor docs issues and a missing file on the meta package which I've corrected.

I've also flagged two issues inline. One is "strong opinion, weakly held" (passing in --output building into a single /distfolder); the other is a "weak opinion, weakly held" (making tox -e package a package-level tox definition). I'm marking the PR as approved; I'm totally OK with this being merged without further changes, but if either of those points seem reasonable to you, I'd be OK with the change - and as long as CI still passes, a merge.

tox.ini Show resolved Hide resolved
.github/workflows/ci.yml Show resolved Hide resolved
demo/README.rst Outdated Show resolved Hide resolved
docs/reference/platforms.rst Outdated Show resolved Hide resolved
docs/reference/platforms.rst Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Nov 8, 2022

Codecov Report

Merging #1669 (7ddf3b5) into main (2e1b56b) will not change coverage.
The diff coverage is n/a.

Impacted Files Coverage Δ
core/src/toga/__init__.py 100.00% <ø> (ø)
core/src/toga/app.py 80.00% <ø> (ø)
core/src/toga/colors.py 100.00% <ø> (ø)
core/src/toga/command.py 97.14% <ø> (ø)
core/src/toga/constants/__init__.py 0.00% <ø> (ø)
core/src/toga/documents.py 100.00% <ø> (ø)
core/src/toga/fonts.py 87.50% <ø> (ø)
core/src/toga/handlers.py 40.00% <ø> (ø)
core/src/toga/icons.py 85.96% <ø> (ø)
core/src/toga/images.py 100.00% <ø> (ø)
... and 92 more

Copy link
Member

@freakboy3742 freakboy3742 left a comment

Choose a reason for hiding this comment

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

Looks good, and the 0.0.1rc10 release appears to work in my testing.

The only problem I've spotted is tied to the one piece of CI that we can't exercise - the release script.

- name: Extract ${{ matrix.package }}
run: |
mkdir dist
mv packages/$(echo ${{ matrix.package }} | sed 's/_/?/')-[0-9]* dist
mv */dist/$(echo ${{ matrix.package }} | sed 's/_/?/')-[0-9]* dist
Copy link
Member

Choose a reason for hiding this comment

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

I think there might be an analogous change missing from publish.rst?

Copy link
Member

Choose a reason for hiding this comment

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

After discussion in person, turns out this isn't an issue on publish, because in the publish action, the artefact is coming from the GitHub Release, rather than the CI artefact,

Copy link
Member

@freakboy3742 freakboy3742 left a comment

Choose a reason for hiding this comment

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

After discussion in person, looks like the problem I flagged isn't actually a problem; so I think we're good to go!

- name: Extract ${{ matrix.package }}
run: |
mkdir dist
mv packages/$(echo ${{ matrix.package }} | sed 's/_/?/')-[0-9]* dist
mv */dist/$(echo ${{ matrix.package }} | sed 's/_/?/')-[0-9]* dist
Copy link
Member

Choose a reason for hiding this comment

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

After discussion in person, turns out this isn't an issue on publish, because in the publish action, the artefact is coming from the GitHub Release, rather than the CI artefact,

@freakboy3742 freakboy3742 merged commit 3c38759 into beeware:main Nov 9, 2022
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.

Restructure repository
2 participants