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

DEV/MNT: migrate to latest standards with pyproject.toml [LCLSPC-603] #542

Merged
merged 35 commits into from
Feb 17, 2023

Conversation

tangkong
Copy link
Contributor

Description

runs pcds-python-migration-tools on this repository

Motivation and Context

Prep for the hackathon, clean up this repo

How Has This Been Tested?

Hopefully with GHA soon

Where Has This Been Documented?

This PR

Performed by pcds-migration-tools DeleteFiles
Performed by pcds-migration-tools AddFileFromTemplate
Performed by pcds-migration-tools AddFileFromTemplate
Performed by pcds-migration-tools AddFileFromTemplate
Performed by pcds-migration-tools AddFileFromTemplate
Performed by pcds-migration-tools AddFileFromTemplate
Performed by pcds-migration-tools AddFileFromTemplate
Performed by pcds-migration-tools AddFileFromTemplate
Performed by pcds-migration-tools AddFileFromTemplate
Performed by pcds-migration-tools GitHubActionsMigration
Performed by pcds-migration-tools UpdateSphinx
Performed by pcds-migration-tools RunPyupgrade
Performed by pcds-migration-tools PyprojectTomlMigration
Performed by pcds-migration-tools SetuptoolsScmMigration
Performed by pcds-migration-tools UpdateCondaRecipe
Performed by pcds-migration-tools RunPycln
Performed by pcds-migration-tools RunPrecommit
conda-recipe/meta.yaml Outdated Show resolved Hide resolved
conda-recipe/meta.yaml Outdated Show resolved Hide resolved
@@ -248,10 +247,10 @@ def use_stylesheet(dark=False, widget=None):
# Load the path to the file
style_path = os.path.join(ui_dir, 'style.qss')
if not os.path.exists(style_path):
raise EnvironmentError("Unable to find Typhos stylesheet in {}"
Copy link
Contributor

Choose a reason for hiding this comment

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

First I've noticed it:

The following exceptions are kept for compatibility with previous versions; starting from Python 3.3, they are aliases of [OSError](https://docs.python.org/3/library/exceptions.html#OSError).

exception EnvironmentError

https://docs.python.org/3/library/exceptions.html#EnvironmentError

pyproject.toml Outdated Show resolved Hide resolved
@tangkong
Copy link
Contributor Author

tangkong commented Feb 15, 2023

I give up on the tests for now. I think for the sake of allowing people to contribute to typhos (and not having to deal with pyupgrade merge conflicts) I'll make a followup issue for the troublesome tests and skip them. Maybe I'll get local gha working some time soon.

@ZLLentz
Copy link
Member

ZLLentz commented Feb 16, 2023

I think that's a good call.
To be clear, this issue only happens on the CI, not when running the tests locally?

@tangkong
Copy link
Contributor Author

I think that's a good call. To be clear, this issue only happens on the CI, not when running the tests locally?

Yep, all the tests pass for me locally. 😢

@tangkong tangkong requested review from klauer and ZLLentz February 16, 2023 00:49
@ZLLentz
Copy link
Member

ZLLentz commented Feb 16, 2023

I wonder if there's any way to tell if we're on the CI so we can at least make sure they all run locally. A generic @skip_on_ci decorator could be useful.

I'll review tomorrow.

Copy link
Member

@ZLLentz ZLLentz left a comment

Choose a reason for hiding this comment

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

Do we need to merge before we can set the required/not required settings?

@klauer
Copy link
Contributor

klauer commented Feb 16, 2023

@tangkong
Copy link
Contributor Author

huh we didn't have branch protection rules already set up for typhos?...

@klauer
Copy link
Contributor

klauer commented Feb 17, 2023

Branch protection set with the above-mentioned script.

Merging because our required tests are passing and it's Friday and there's no one here to stop me.

@klauer klauer merged commit 6032b9b into pcdshub:master Feb 17, 2023
@klauer klauer changed the title BLD: GHA migration DEV/MNT: migrate to latest standards with pyproject.toml [LCLSPC-603] Mar 8, 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.

3 participants