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

Merge dev and do new release #386

Merged
merged 124 commits into from
Aug 26, 2024
Merged

Merge dev and do new release #386

merged 124 commits into from
Aug 26, 2024

Conversation

vhaasteren
Copy link
Member

@vhaasteren vhaasteren commented May 9, 2024

As described in issue #385, merge dev->master and do a new release

All other changes postponed for merge into master. Those will get updated on the new dev branch

vhaasteren and others added 30 commits April 21, 2023 17:55
…son, and updated fastshermanmorrison-pulsar in requirements_dev.txt
@vhaasteren vhaasteren marked this pull request as draft May 9, 2024 14:48
@AaronDJohnson
Copy link
Collaborator

I think we need to merge main into dev to get the macos tests to work.

@AaronDJohnson
Copy link
Collaborator

AaronDJohnson commented May 9, 2024

Ah maybe not. It's the usual suspect:
Cannot find tempo2 install location.

@vhaasteren
Copy link
Member Author

@AaronDJohnson,

It turns out that enterprise_extensions has some dependencies on the dev branch. Is it an idea to just merge dev as-is to accommodate, and deal with tempo2/pint optional dependencies and feather later? Those can go into the dev branch when ready.

@AaronDJohnson
Copy link
Collaborator

@vhaasteren I think that's a good idea. Lately, I have been more busy than I thought I would be. So let's go ahead and merge and then work on these extra features.

@AaronDJohnson
Copy link
Collaborator

AaronDJohnson commented Aug 4, 2024

The tests weren't passing because of libstempo/TEMPO2.... Those issues should be solved now. Maybe the tests will pass on rerunning them?

@AaronDJohnson AaronDJohnson marked this pull request as ready for review August 12, 2024 14:56
@AaronDJohnson
Copy link
Collaborator

Two more issues now: TEMPO2 can't be found on the Mac installs and 3.7 is still required for merging.

@AaronDJohnson AaronDJohnson merged commit 1ab8ad9 into master Aug 26, 2024
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants