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

pull hotfixes from master to develop #98

Merged
merged 9 commits into from
Jan 15, 2025
Merged

pull hotfixes from master to develop #98

merged 9 commits into from
Jan 15, 2025

Conversation

solomon-negusse
Copy link
Member

No description provided.

dmannarino and others added 9 commits September 5, 2023 15:07
Merge version pins up to production
This reverts commit ba627d5.
Merge changes (Python, package upgrades) up to production
Merge up OTF list feature; use of new no-numpy layers
remove xray and add code guru profiling
add back xray for list processing
Copy link
Contributor

@danscales danscales 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. Not sure why the file changes show Justin's hotfix changes in geometry.py and tiling.py, since I already pulled them over to develop this morning, but should be fine, since they are already there in develop.

@solomon-negusse solomon-negusse merged commit 2c49a96 into develop Jan 15, 2025
2 checks passed
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