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

Align develop with main #303

Open
wants to merge 35 commits into
base: develop
Choose a base branch
from
Open

Align develop with main #303

wants to merge 35 commits into from

Conversation

imilinovic
Copy link

@imilinovic imilinovic commented Feb 15, 2024

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.

  • Other (please describe):

Related issues

Delete section if this PR doesn't resolve any issues.

Closes (link to issue)

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

######################################

Reviewer checklist (the reviewer checks this part)

  • Core feature implementation
  • Tests
  • Code documentation
  • Documentation on gqlalchemy/docs

######################################

insectatorious and others added 30 commits April 18, 2023 14:59
* 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 <ante.pusic@fer.hr>
* 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 <61758502+katarinasupe@users.noreply.github.com>

* Update README

* Update README.md

---------

Co-authored-by: katarinasupe <supe.katarina@gmail.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>
* 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ć <ante.pusic@memgraph.io>

* Update docs/how-to-guides/query-builder.md

Co-authored-by: Ante Pušić <ante.pusic@memgraph.io>

---------

Co-authored-by: Ante Pušić <ante.pusic@memgraph.io>
* 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ć <bruno.sacaric@gmail.com>

* 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 <aalekh.gwpeck.7998@icloud.com>

* Apply black.

Signed-off-by: Aalekh Patel <aalekh.gwpeck.7998@icloud.com>

* Apply black to tests as well.

Signed-off-by: Aalekh Patel <aalekh.gwpeck.7998@icloud.com>

* typo fix in function signature.

Signed-off-by: Aalekh Patel <aalekh.gwpeck.7998@icloud.com>

* Assert the counts of nodes and relationships in the test.

Signed-off-by: Aalekh Patel <aalekh.gwpeck.7998@icloud.com>

* Apply black.

Signed-off-by: Aalekh Patel <aalekh.gwpeck.7998@icloud.com>

* 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 <aalekh.gwpeck.7998@icloud.com>

* Remove unused test functions.

Signed-off-by: Aalekh Patel <aalekh.gwpeck.7998@icloud.com>

---------

Signed-off-by: Aalekh Patel <aalekh.gwpeck.7998@icloud.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>
Co-authored-by: Bruno Sačarić <bruno.sacaric@gmail.com>
Co-authored-by: katarinasupe <supe.katarina@gmail.com>
Co-authored-by: Aalekh Patel <aalekh@protectchildren.ca>
* spelling: attribute

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: authentication

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: bidirectional

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: delimiter

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: dijkstra

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: further

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: infers

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: inheritance

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: instantiated

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: memgraph

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: networkx

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: overridden

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: parenthesis

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: properties

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: queries

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: query

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: that are

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: that

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

---------

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* 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 <supe.katarina@gmail.com>
* 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 <supe.katarina@gmail.com>
* Update connect to Memgraph

* Update link to installation guide

* Remove prerequisite
@imilinovic imilinovic added the Docs unnecessary Docs unnecessary label Feb 15, 2024
@imilinovic imilinovic self-assigned this Feb 15, 2024
@imilinovic imilinovic marked this pull request as ready for review February 15, 2024 14:46
@as51340
Copy link
Contributor

as51340 commented Feb 15, 2024

What are your commits? History seems messy

@imilinovic
Copy link
Author

imilinovic commented Feb 15, 2024

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Docs unnecessary Docs unnecessary
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants