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

Release resolve conflicts #117

Merged
merged 161 commits into from
Nov 20, 2023
Merged

Release resolve conflicts #117

merged 161 commits into from
Nov 20, 2023

Conversation

mpound
Copy link
Collaborator

@mpound mpound commented Nov 20, 2023

No description provided.

mpound and others added 30 commits June 19, 2023 11:48
Fix syntax error in release.yaml

Can't say for sure that the release action works as intended, but it at least appears to have stopped causing syntax errors
Hatch:
- Add test envs
- Add [dev] and [docs] optional-dependencies "features"
- Add new scripts for easy linting/testing/doc-building

Linting/tooling:
- Expand ruff linting rule selections
- Replace isort config; replace with ruff
- Remove pyright config

pre-commit:
- No longer using isort; replaced with ruff
- Tweaks to black args
- Update pip-compile step so it works with pyproject.toml (installs all
optional dependencies and dumps them to requirements.txt)
- Run $ pre-commit auto-update
Note: there are currently 27 linting errors from ruff. I am leaving
these in here; they will need to be either fixed, or skipped using '$ SKIP=ruff git commit
...' before further commits can be made
Tweak a few linting settings
Disable ruff pre-commit hook in github action, since it is currently
failing
It's currently failing due to issues that I'm not qualified to fix

Also, merged docs and dev in optional-dependencies

Renamed matrix test runner
These changes look great, thanks for all the work!
Adds Evan's development branch (evan-devel) to the list of triggering branches.
Copy link
Collaborator

@astrofle astrofle left a comment

Choose a reason for hiding this comment

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

Thanks Marc!

@astrofle astrofle merged commit 501448a into release-0.2.0 Nov 20, 2023
21 checks passed
@mpound mpound deleted the release_resolve_conflicts branch December 4, 2023 17:47
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