Rename main module from edgedb to gel

.github/workflows/release.yml

@@ -4,14 +4,15 @@ on:
   workflow_dispatch:
     inputs: {}
 
-  pull_request:
-    branches:
-      - "master"
-      - "ci"
-      - "release/[0-9]+.x"
-      - "release/[0-9]+.[0-9]+.x"
-    paths:
-      - "edgedb/_version.py"
+  # XXX: Commented out to prevent firing during this refactor.
+  # pull_request:
+  #   branches:
+  #     - "master"
+  #     - "ci"
+  #     - "release/[0-9]+.x"
+  #     - "release/[0-9]+.[0-9]+.x"
+  #   paths:
+  #     - "gel/_version.py"
 
 jobs:
   validate-release-request:

.gitignore

@@ -29,3 +29,4 @@ docs/_build
 /edgedb/**/*.html
 /tmp
 /wheelhouse
+/env*

.gitmodules

@@ -1,5 +1,5 @@
 [submodule "edgedb/pgproto"]
-	path = edgedb/pgproto
+	path = gel/pgproto
 	url = https://github.com/MagicStack/py-pgproto.git
 [submodule "tests/shared-client-testcases"]
 	path = tests/shared-client-testcases

Makefile

@@ -11,25 +11,25 @@ all: compile
 clean:
 	rm -fr $(ROOT)/dist/
 	rm -fr $(ROOT)/doc/_build/
-	rm -fr $(ROOT)/edgedb/pgproto/*.c
-	rm -fr $(ROOT)/edgedb/pgproto/*.html
-	rm -fr $(ROOT)/edgedb/pgproto/codecs/*.html
-	rm -fr $(ROOT)/edgedb/protocol/*.c
-	rm -fr $(ROOT)/edgedb/protocol/*.html
-	rm -fr $(ROOT)/edgedb/protocol/*.so
-	rm -fr $(ROOT)/edgedb/datatypes/*.so
-	rm -fr $(ROOT)/edgedb/datatypes/datatypes.c
+	rm -fr $(ROOT)/gel/pgproto/*.c
+	rm -fr $(ROOT)/gel/pgproto/*.html
+	rm -fr $(ROOT)/gel/pgproto/codecs/*.html
+	rm -fr $(ROOT)/gel/protocol/*.c
+	rm -fr $(ROOT)/gel/protocol/*.html
+	rm -fr $(ROOT)/gel/protocol/*.so
+	rm -fr $(ROOT)/gel/datatypes/*.so
+	rm -fr $(ROOT)/gel/datatypes/datatypes.c
 	rm -fr $(ROOT)/build
-	rm -fr $(ROOT)/edgedb/protocol/codecs/*.html
+	rm -fr $(ROOT)/gel/protocol/codecs/*.html
 	find . -name '__pycache__' | xargs rm -rf
 
 
 _touch:
-	rm -fr $(ROOT)/edgedb/datatypes/datatypes.c
-	rm -fr $(ROOT)/edgedb/protocol/protocol.c
-	find $(ROOT)/edgedb/protocol -name '*.pyx' | xargs touch
-	find $(ROOT)/edgedb/datatypes -name '*.pyx' | xargs touch
-	find $(ROOT)/edgedb/datatypes -name '*.c' | xargs touch
+	rm -fr $(ROOT)/gel/datatypes/datatypes.c
+	rm -fr $(ROOT)/gel/protocol/protocol.c
+	find $(ROOT)/gel/protocol -name '*.pyx' | xargs touch
+	find $(ROOT)/gel/datatypes -name '*.pyx' | xargs touch
+	find $(ROOT)/gel/datatypes -name '*.c' | xargs touch
 
 
 compile: _touch
@@ -39,12 +39,12 @@ compile: _touch
 gen-errors:
 	edb gen-errors --import "$(echo "from edgedb.errors._base import *"; echo "from edgedb.errors.tags import *")" \
 		--extra-all "_base.__all__" --stdout --client > $(ROOT)/.errors
-	mv $(ROOT)/.errors $(ROOT)/edgedb/errors/__init__.py
+	mv $(ROOT)/.errors $(ROOT)/gel/errors/__init__.py
 	$(PYTHON) tools/gen_init.py
 
 
 gen-types:
-	edb gen-types --stdout > $(ROOT)/edgedb/protocol/codecs/edb_types.pxi
+	edb gen-types --stdout > $(ROOT)/gel/protocol/codecs/edb_types.pxi
 
 
 debug: _touch

edgedb/__init__.py

@@ -1,284 +1,11 @@
-#
-# This source file is part of the EdgeDB open source project.
-#
-# Copyright 2016-present MagicStack Inc. and the EdgeDB authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-# flake8: noqa
-
-from ._version import __version__
-
-from edgedb.datatypes.datatypes import (
-    Tuple, NamedTuple, EnumValue, RelativeDuration, DateDuration, ConfigMemory
-)
-from edgedb.datatypes.datatypes import Set, Object, Array
-from edgedb.datatypes.range import Range, MultiRange
-
-from .abstract import (
-    Executor, AsyncIOExecutor, ReadOnlyExecutor, AsyncIOReadOnlyExecutor,
-)
-
-from .asyncio_client import (
-    create_async_client,
-    AsyncIOClient
-)
-
-from .blocking_client import create_client, Client
-from .enums import Cardinality, ElementKind
-from .options import RetryCondition, IsolationLevel, default_backoff
-from .options import RetryOptions, TransactionOptions
-from .options import State
-
-from .errors._base import EdgeDBError, EdgeDBMessage
-
-__all__ = [
-    "Array",
-    "AsyncIOClient",
-    "AsyncIOExecutor",
-    "AsyncIOReadOnlyExecutor",
-    "Cardinality",
-    "Client",
-    "ConfigMemory",
-    "DateDuration",
-    "EdgeDBError",
-    "EdgeDBMessage",
-    "ElementKind",
-    "EnumValue",
-    "Executor",
-    "IsolationLevel",
-    "NamedTuple",
-    "Object",
-    "Range",
-    "ReadOnlyExecutor",
-    "RelativeDuration",
-    "RetryCondition",
-    "RetryOptions",
-    "Set",
-    "State",
-    "TransactionOptions",
-    "Tuple",
-    "create_async_client",
-    "create_client",
-    "default_backoff",
-]
-
-
-# The below is generated by `make gen-errors`.
-# DO NOT MODIFY BY HAND.
-#
-# <ERRORS-AUTOGEN>
-from .errors import (
-    InternalServerError,
-    UnsupportedFeatureError,
-    ProtocolError,
-    BinaryProtocolError,
-    UnsupportedProtocolVersionError,
-    TypeSpecNotFoundError,
-    UnexpectedMessageError,
-    InputDataError,
-    ParameterTypeMismatchError,
-    StateMismatchError,
-    ResultCardinalityMismatchError,
-    CapabilityError,
-    UnsupportedCapabilityError,
-    DisabledCapabilityError,
-    QueryError,
-    InvalidSyntaxError,
-    EdgeQLSyntaxError,
-    SchemaSyntaxError,
-    GraphQLSyntaxError,
-    InvalidTypeError,
-    InvalidTargetError,
-    InvalidLinkTargetError,
-    InvalidPropertyTargetError,
-    InvalidReferenceError,
-    UnknownModuleError,
-    UnknownLinkError,
-    UnknownPropertyError,
-    UnknownUserError,
-    UnknownDatabaseError,
-    UnknownParameterError,
-    SchemaError,
-    SchemaDefinitionError,
-    InvalidDefinitionError,
-    InvalidModuleDefinitionError,
-    InvalidLinkDefinitionError,
-    InvalidPropertyDefinitionError,
-    InvalidUserDefinitionError,
-    InvalidDatabaseDefinitionError,
-    InvalidOperatorDefinitionError,
-    InvalidAliasDefinitionError,
-    InvalidFunctionDefinitionError,
-    InvalidConstraintDefinitionError,
-    InvalidCastDefinitionError,
-    DuplicateDefinitionError,
-    DuplicateModuleDefinitionError,
-    DuplicateLinkDefinitionError,
-    DuplicatePropertyDefinitionError,
-    DuplicateUserDefinitionError,
-    DuplicateDatabaseDefinitionError,
-    DuplicateOperatorDefinitionError,
-    DuplicateViewDefinitionError,
-    DuplicateFunctionDefinitionError,
-    DuplicateConstraintDefinitionError,
-    DuplicateCastDefinitionError,
-    DuplicateMigrationError,
-    SessionTimeoutError,
-    IdleSessionTimeoutError,
-    QueryTimeoutError,
-    TransactionTimeoutError,
-    IdleTransactionTimeoutError,
-    ExecutionError,
-    InvalidValueError,
-    DivisionByZeroError,
-    NumericOutOfRangeError,
-    AccessPolicyError,
-    QueryAssertionError,
-    IntegrityError,
-    ConstraintViolationError,
-    CardinalityViolationError,
-    MissingRequiredError,
-    TransactionError,
-    TransactionConflictError,
-    TransactionSerializationError,
-    TransactionDeadlockError,
-    WatchError,
-    ConfigurationError,
-    AccessError,
-    AuthenticationError,
-    AvailabilityError,
-    BackendUnavailableError,
-    ServerOfflineError,
-    BackendError,
-    UnsupportedBackendFeatureError,
-    LogMessage,
-    WarningMessage,
-    ClientError,
-    ClientConnectionError,
-    ClientConnectionFailedError,
-    ClientConnectionFailedTemporarilyError,
-    ClientConnectionTimeoutError,
-    ClientConnectionClosedError,
-    InterfaceError,
-    QueryArgumentError,
-    MissingArgumentError,
-    UnknownArgumentError,
-    InvalidArgumentError,
-    NoDataError,
-    InternalClientError,
-)
-
-__all__.extend([
-    "InternalServerError",
-    "UnsupportedFeatureError",
-    "ProtocolError",
-    "BinaryProtocolError",
-    "UnsupportedProtocolVersionError",
-    "TypeSpecNotFoundError",
-    "UnexpectedMessageError",
-    "InputDataError",
-    "ParameterTypeMismatchError",
-    "StateMismatchError",
-    "ResultCardinalityMismatchError",
-    "CapabilityError",
-    "UnsupportedCapabilityError",
-    "DisabledCapabilityError",
-    "QueryError",
-    "InvalidSyntaxError",
-    "EdgeQLSyntaxError",
-    "SchemaSyntaxError",
-    "GraphQLSyntaxError",
-    "InvalidTypeError",
-    "InvalidTargetError",
-    "InvalidLinkTargetError",
-    "InvalidPropertyTargetError",
-    "InvalidReferenceError",
-    "UnknownModuleError",
-    "UnknownLinkError",
-    "UnknownPropertyError",
-    "UnknownUserError",
-    "UnknownDatabaseError",
-    "UnknownParameterError",
-    "SchemaError",
-    "SchemaDefinitionError",
-    "InvalidDefinitionError",
-    "InvalidModuleDefinitionError",
-    "InvalidLinkDefinitionError",
-    "InvalidPropertyDefinitionError",
-    "InvalidUserDefinitionError",
-    "InvalidDatabaseDefinitionError",
-    "InvalidOperatorDefinitionError",
-    "InvalidAliasDefinitionError",
-    "InvalidFunctionDefinitionError",
-    "InvalidConstraintDefinitionError",
-    "InvalidCastDefinitionError",
-    "DuplicateDefinitionError",
-    "DuplicateModuleDefinitionError",
-    "DuplicateLinkDefinitionError",
-    "DuplicatePropertyDefinitionError",
-    "DuplicateUserDefinitionError",
-    "DuplicateDatabaseDefinitionError",
-    "DuplicateOperatorDefinitionError",
-    "DuplicateViewDefinitionError",
-    "DuplicateFunctionDefinitionError",
-    "DuplicateConstraintDefinitionError",
-    "DuplicateCastDefinitionError",
-    "DuplicateMigrationError",
-    "SessionTimeoutError",
-    "IdleSessionTimeoutError",
-    "QueryTimeoutError",
-    "TransactionTimeoutError",
-    "IdleTransactionTimeoutError",
-    "ExecutionError",
-    "InvalidValueError",
-    "DivisionByZeroError",
-    "NumericOutOfRangeError",
-    "AccessPolicyError",
-    "QueryAssertionError",
-    "IntegrityError",
-    "ConstraintViolationError",
-    "CardinalityViolationError",
-    "MissingRequiredError",
-    "TransactionError",
-    "TransactionConflictError",
-    "TransactionSerializationError",
-    "TransactionDeadlockError",
-    "WatchError",
-    "ConfigurationError",
-    "AccessError",
-    "AuthenticationError",
-    "AvailabilityError",
-    "BackendUnavailableError",
-    "ServerOfflineError",
-    "BackendError",
-    "UnsupportedBackendFeatureError",
-    "LogMessage",
-    "WarningMessage",
-    "ClientError",
-    "ClientConnectionError",
-    "ClientConnectionFailedError",
-    "ClientConnectionFailedTemporarilyError",
-    "ClientConnectionTimeoutError",
-    "ClientConnectionClosedError",
-    "InterfaceError",
-    "QueryArgumentError",
-    "MissingArgumentError",
-    "UnknownArgumentError",
-    "InvalidArgumentError",
-    "NoDataError",
-    "InternalClientError",
-])
-# </ERRORS-AUTOGEN>
+# Auto-generated shim
+import gel as _mod
+import sys as _sys
+_cur = _sys.modules['edgedb']
+for _k in vars(_mod):
+    if not _k.startswith('__') or _k in ('__all__', '__doc__'):
+        setattr(_cur, _k, getattr(_mod, _k))
+del _cur
+del _sys
+del _mod
+del _k