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

Cat devel merger #85

Merged
merged 14 commits into from
Oct 6, 2023
Merged

Cat devel merger #85

merged 14 commits into from
Oct 6, 2023

Conversation

vcatlett
Copy link
Contributor

@vcatlett vcatlett commented Oct 5, 2023

Hopefully I don't have to close this again! This is all the documentation and test changes. I'll go through and leave comments on changes that might be confusing.

@vcatlett vcatlett requested a review from mpound October 5, 2023 16:20
@vcatlett vcatlett temporarily deployed to hatch build October 5, 2023 16:20 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 5, 2023 16:20 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 5, 2023 16:20 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 5, 2023 16:20 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 5, 2023 16:20 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 5, 2023 16:20 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 5, 2023 16:20 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 5, 2023 16:20 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 5, 2023 16:20 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 5, 2023 16:20 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 5, 2023 16:20 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 5, 2023 16:20 — with GitHub Actions Inactive
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Moved to top level of directory so there's not a separate docs-only environment for developers. Can add more environment variables for development here as needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Combination of the old build.yml (which built with hatch) and python-package.yml (which tested with pytest).

Copy link
Collaborator

Choose a reason for hiding this comment

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

I had build.yml separate because it is used when making releases ( "on: release:"). This commit changes that function entirely, so I can't accept this change.

Copy link
Collaborator

Choose a reason for hiding this comment

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

The recommended way of doing this is to invoke build action from whatever other yml you want to do a build. We should be moving towards smallish action ymls that can be invoked in different places.

Copy link
Collaborator

Choose a reason for hiding this comment

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

also the workflow_dispatch is required so we can run this action manually from github when needed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reverted build.yml to its original version and renamed the other test build-and-pytest.yml

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Test to check if the pyinstaller run fails for the GUI. GUI code not added yet, but I'm adding this with the tests so it runs when I do add the GUI code.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Combined with build.yml (see above)

.gitignore Show resolved Hide resolved
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed a typo and added instructions for specifying which Python hatch should use (since the system python at GBO is way out of date)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Placeholder file that needs to be filled out with more contribution information

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Info about the rich text printing I added

@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:49 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:49 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:49 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:49 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:49 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:49 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:49 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:49 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:49 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:49 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:49 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:49 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:54 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:54 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:54 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:54 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:54 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:54 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:55 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:55 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:55 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:55 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:55 — with GitHub Actions Inactive
@vcatlett vcatlett temporarily deployed to hatch build October 6, 2023 00:55 — with GitHub Actions Inactive
Copy link
Collaborator

@mpound mpound 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. Thanks for reverting those YML files.

@mpound mpound merged commit 8d77763 into release-0.2.0 Oct 6, 2023
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.

2 participants