Align develop with main #303
Closed
Conversation
This file contains 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
* Remove extra positional argument for function `escape_value` doesn't accept two positional arguments, this change removes the extra boolean value. * Add basic tests for list & dict * Remove extra blank line after running Black * Fix dict property bug Before this change, a Python dict was being converted as `value:value` instead of `key:value`. Special thanks to katarina.supe for providing the fix. * Remove neo4j parameterised test for dict property Speaking to katarina.supe and we determined this is necessary as Neo4J doesn't support dict.
* Initial commit * Add [all] option * Add extras to workflow file * Fix workflow * Test workflows on the original state * Test workflows (poetry.lock consistent with pyproject.toml) * Readd changes with fixed lock file * Update lock * Fix poetry.lock * Add review suggestions * Make spelling consistent * Mark tests requiring extras & modify imports if extras not installed * FIx formatting * Comply with flake8/black * Remove torch as independent extra * Rename extra * Re-add torch (for users who will manually install dgl) * Add detailed test grouping * Fix import * Fix import in utilities.py * Switch to optionally importing torch (in graph translators) * Fix typo * Add import checks * Improve import/export tests * Remove unnecessary test mark * Fix optional dependency tests * Rename optional import parameters & torch extra
* Update reference guide * Update CODEOWNERS
* Update installation prerequisites * Update with optional dependencies * Change docs generation instructions * Update README with optional dependencies * Add PyG installation --------- Co-authored-by: antepusic <[email protected]>
* Initial commit of docs * Update H1 in documents * Add mkdocs * Update styling and syntax * Update navigation * Update links * Update links * Update internal links * Update external Memgraph links * Update docs * Add logo and favicon * Update README.md Co-authored-by: Katarina Supe <[email protected]> * Update README * Update README.md --------- Co-authored-by: katarinasupe <[email protected]> Co-authored-by: Katarina Supe <[email protected]>
* Update menu items * Reorder menu items * Update broken links * Update menu items * Update docs link
* Update Markdown code for the lists * Update docs/how-to-guides/ogm.md Co-authored-by: Ante Pušić <[email protected]> * Update docs/how-to-guides/query-builder.md Co-authored-by: Ante Pušić <[email protected]> --------- Co-authored-by: Ante Pušić <[email protected]>
* Update pull_request_template.md Update the PR template to reflect that GQLAlchemy docs are now independent. * Fix formatting
* Align develop and main branch (#237) Co-authored-by: Bruno Sačarić <[email protected]> * Inject a GetOrCreateMixin to Node and Relationship. * Use the imported GQLAlchemyError instead of a fully qualified path. * Use the imported Tuple instead of fully qualified typing.Tuple * Run black. * suppress flake8's f821 on get_or_create definition * Add tests for get_or_create and refactor the mixin into separate implementations for improved docs. Signed-off-by: Aalekh Patel <[email protected]> * Apply black. Signed-off-by: Aalekh Patel <[email protected]> * Apply black to tests as well. Signed-off-by: Aalekh Patel <[email protected]> * typo fix in function signature. Signed-off-by: Aalekh Patel <[email protected]> * Assert the counts of nodes and relationships in the test. Signed-off-by: Aalekh Patel <[email protected]> * Apply black. Signed-off-by: Aalekh Patel <[email protected]> * Add the .execute() to the query builder in failing tests and provide "name" to the node instantiation because it is a required field. * another attempt to fix the query builder usage in tests. * apply black fixes. * Fix tests by relying on the database identifier `_id` instead of the user-defined `id`. Signed-off-by: Aalekh Patel <[email protected]> * Remove unused test functions. Signed-off-by: Aalekh Patel <[email protected]> --------- Signed-off-by: Aalekh Patel <[email protected]> Co-authored-by: Katarina Supe <[email protected]> Co-authored-by: Bruno Sačarić <[email protected]> Co-authored-by: katarinasupe <[email protected]> Co-authored-by: Aalekh Patel <[email protected]>
* spelling: attribute Signed-off-by: Josh Soref <[email protected]> * spelling: authentication Signed-off-by: Josh Soref <[email protected]> * spelling: bidirectional Signed-off-by: Josh Soref <[email protected]> * spelling: delimiter Signed-off-by: Josh Soref <[email protected]> * spelling: dijkstra Signed-off-by: Josh Soref <[email protected]> * spelling: further Signed-off-by: Josh Soref <[email protected]> * spelling: infers Signed-off-by: Josh Soref <[email protected]> * spelling: inheritance Signed-off-by: Josh Soref <[email protected]> * spelling: instantiated Signed-off-by: Josh Soref <[email protected]> * spelling: memgraph Signed-off-by: Josh Soref <[email protected]> * spelling: networkx Signed-off-by: Josh Soref <[email protected]> * spelling: overridden Signed-off-by: Josh Soref <[email protected]> * spelling: parenthesis Signed-off-by: Josh Soref <[email protected]> * spelling: properties Signed-off-by: Josh Soref <[email protected]> * spelling: queries Signed-off-by: Josh Soref <[email protected]> * spelling: query Signed-off-by: Josh Soref <[email protected]> * spelling: that are Signed-off-by: Josh Soref <[email protected]> * spelling: that Signed-off-by: Josh Soref <[email protected]> --------- Signed-off-by: Josh Soref <[email protected]>
* Bump pydantic to v2 * Change poetry.lock * Remove leading underscore from subtypes * Add type annotation to GraphObject * Dict type * Add underscore * V 2.1.0 * Try using v1 API features * v1 import * Bump to 2.3.0
* Turn Docker into an optional dependency * Fix lock file (use --no-update) * Fix black formatting
* Document that Docker is an optional dependency * Update installation instructions * Update README * update reference guide --------- Co-authored-by: katarinasupe <[email protected]>
* remove poetry lock * bump dependencies * revert dgl bump * add lock * bump up dgl * revert * update lock * bump pyarrow * update adlfs to resolve aiohttp
* update docs * update readme and add changelog * update version
Fixed zsh command for easier copying
* Update README * update readme * add anchor * update docs * update changelog --------- Co-authored-by: katarinasupe <[email protected]>
* Update connect to Memgraph * Update link to installation guide * Remove prerequisite
imilinovic
requested review from
Josipmrden,
katarinasupe and
as51340
as code owners
|
What are your commits? History seems messy |
|
This is just a merge with main so the other PRs that will come after will be clean since new features should be merged to dev first. The dev branch is currently 35 commits behind main. |
katarinasupe
approved these changes
Jun 5, 2024
katarinasupe
reviewed
Jun 5, 2024
There was a problem hiding this comment.
If I remembered correctly, I think we abandoned develop branch and continued with just merging to main and creating release branch after the release (https://github.com/memgraph/gqlalchemy/blob/main/CONTRIBUTING.md). @as51340 do you remember if that's what we concluded?
|
No need to do this, we no longer use the develop branch. @imilinovic |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Align develop with main so the new PRs that will be merged to develop have normal history & files changed.
Pull request type
Please delete options that are not relevant.
Related issues
Delete section if this PR doesn't resolve any issues.
Closes (link to issue)
Checklist:
######################################
Reviewer checklist (the reviewer checks this part)
######################################