Sync upstream fixes from mwang87/MassQueryLanguage#2
Merged
joewandy merged 7 commits intoj-a-dietrich:masterfrom Jul 4, 2025
joewandy:sync-ming-fixes
Merged
Sync upstream fixes from mwang87/MassQueryLanguage#2joewandy merged 7 commits intoj-a-dietrich:masterfrom joewandy:sync-ming-fixes
joewandy merged 7 commits intoj-a-dietrich:masterfrom
joewandy:sync-ming-fixes
Conversation
fixing regex for formulas
Brings in the following fixes from upstream: - Regex fix (PR mwang87#251) - Updated dependencies - File size and symlinks handling improvements - Various bug fixes and test updates Resolved conflict in setup.py by keeping massql4motifs metadata
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR brings in the latest fixes from the upstream mwang87/MassQueryLanguage repository while preserving all motifs functionality.
Changes included from upstream
Conflict resolution
There was only one conflict in
setup.pyregarding package metadata. I resolved it by keeping the massql4motifs package name and author information while incorporating all other changes from upstream.Testing
This allows the massql4motifs fork to benefit from Ming's latest bug fixes while maintaining all the motifs-specific extensions.