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

PR of individual commits to fix small issues. #314

Merged
merged 16 commits into from
Mar 28, 2024
Merged

Conversation

JoeZiminski
Copy link
Member

@JoeZiminski JoeZiminski commented Feb 12, 2024

This PR makes many small fixes to issues that have come up over time. It should be considered as a holding PR for many separate individual issues, which can be considered separately. This should be normal merged (not squash merged) and can be reveiwed by commit. All changes are linked to existing issues:

@niksirbi how did things go in the end with the NIU test action, can I help with anything? I took the lazy way and revereted back to not using for now :'D BTW apologies I did set you as rewiere previously and it was not ready to review - it is now.

@JoeZiminski JoeZiminski changed the base branch from main to tui-dev-branch February 12, 2024 17:31
@JoeZiminski JoeZiminski changed the base branch from tui-dev-branch to add_tui_tests February 12, 2024 17:32
@JoeZiminski JoeZiminski linked an issue Feb 12, 2024 that may be closed by this pull request
@JoeZiminski JoeZiminski force-pushed the fix_small_issues branch 3 times, most recently from 394364c to 6d4c018 Compare February 12, 2024 18:50
@JoeZiminski JoeZiminski force-pushed the fix_small_issues branch 3 times, most recently from f09af86 to dff1a25 Compare February 16, 2024 17:39
@JoeZiminski JoeZiminski force-pushed the fix_small_issues branch 4 times, most recently from d3b6b35 to f47921a Compare February 22, 2024 18:43
@JoeZiminski JoeZiminski deleted the branch main February 22, 2024 19:02
@JoeZiminski JoeZiminski reopened this Feb 22, 2024
@JoeZiminski JoeZiminski changed the base branch from add_tui_tests to tui-dev-branch February 22, 2024 19:08
@JoeZiminski JoeZiminski force-pushed the fix_small_issues branch 2 times, most recently from d118647 to b66f601 Compare March 8, 2024 15:38
@JoeZiminski JoeZiminski changed the title Fix small issues PR of individual commits to fix small issues. Mar 15, 2024
@JoeZiminski JoeZiminski changed the base branch from tui-dev-branch to main March 15, 2024 15:03
Copy link
Member

@niksirbi niksirbi 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 @JoeZiminski ! I reviewed this by commit, as suggested

@niksirbi how did things go in the end with the NIU test action, can I help with anything? I took the lazy way and revereted back to not using for now :'D

We kinda found a functional workaround for movement which allows us to keep using the NIU test action as is.

Basically what we do is the following:

The problem was that tox-conda could not find the conda executable on some OSes (macos-14 and windows), but setting up and activating conda before the tests seems to have taken care of that.

Maybe worth a try for datashuttle as well?

datashuttle/command_line_interface.py Show resolved Hide resolved
tests/tests_integration/test_settings.py Show resolved Hide resolved
@JoeZiminski
Copy link
Member Author

Thanks @niksirbi! These are complete in the following two commits (next PR):

40413ee

6771271

@JoeZiminski JoeZiminski merged commit 8497834 into main Mar 28, 2024
23 checks passed
@JoeZiminski JoeZiminski deleted the fix_small_issues branch April 11, 2024 15:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants