Remove old build files and make python 3.11 work (#415)

* remove all old build logic in favor of poetry

* fix pytest configuration

* update lockfile

* fix enum class generation in python 3.11

* add python 3.11 to the ci test matrix

* fix linting

* modify bumpversion config to not look for setup.py, correct version

* bump requests library

Author: Matthijs van Otterdijk

.bumpversion.cfg

@@ -1,10 +1,8 @@
 [bumpversion]
-current_version = 11.0.0
+current_version = 10.2.4
 commit = True
 tag = True
 
 [bumpversion:file:terminusdb_client/__version__.py]
 
-[bumpversion:file:setup.py]
-
 [bumpversion:file:pyproject.toml]

.github/workflows/python.yml

@@ -20,7 +20,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install tox
-        tox -e deps
     - name: Linting
       run: |
         tox -e check
@@ -29,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v3
@@ -41,7 +40,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install tox
-        tox -e deps
     - name: Test with pytest
       run: |
         [[ "$GITHUB_REPOSITORY" == "terminusdb/terminusdb-client-python" && "$GITHUB_EVENT_NAME" == "push" ]] && export TERMINUSX_TOKEN='${{ secrets.TERMINUSX_TOKEN_DEV }}'
@@ -64,8 +62,8 @@ jobs:
         python-version: "3.10"
     - name: Run setup.py sdist
       run: |
-        pip install wheel
-        python setup.py sdist bdist_wheel
+        pip install poetry
+        poetry build
         tar -xf dist/*.tar.gz
         cat terminusdb-client-*/terminusdb_client.egg-info/requires.txt
         unzip -n dist/*.whl

install.txt

@@ -6,31 +6,25 @@ authors = ["TerminusDB group"]
 license = "Apache Software License"
 
 [tool.poetry.dependencies]
-python = ">=3.8.0,<4.0"
-requests = "<2.29.2"
-shed = "*"
+python = ">=3.8.0,<3.12"
+requests = "^2.31.0"
+numpy = ">= 1.13.0"
 numpydoc = "*"
+pandas = ">= 0.23.0"
 typeguard = "~2.13.3"
 tqdm = "*"
 click = ">=8.0"
+shed = "*"
 
 [tool.poetry.dev-dependencies]
-pytest = "*"
+pytest = ">= 3"
+pytest-cov = "*"
 pytest-mock = "*"
+pytest-xdist = "*"
 flake8 = "*"
-pytest-cov = "*"
-bumpversion = "*"
-sphinx = "*"
-sphinx_rtd_theme = "*"
-sphinxcontrib-napoleon = "*"
-sphinx_autodoc_typehints = "*"
-sphinx_click = "*"
-pandas = "~1.4.0"
-tox = "*"
-interrogate = "*"
-pre-commit = "*"
-shed = "*"
-PyYAML = "<6.0"
+
+[tool.poetry.scripts]
+tdbpy = "terminusdb_client.scripts.scripts:tdbpy"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
@@ -42,3 +36,26 @@ search_path = [ "./terminusdb_client" ]
 
 [tool.pydoc-markdown.renderer]
 type = "gitbook"
+
+[tool.pytest.ini_options]
+addopts = [
+    "-p no:warnings",
+    "--doctest-modules",
+    "--import-mode=importlib",
+]
+doctest_optionflags = [
+   "NORMALIZE_WHITESPACE",
+   "ELLIPSIS"
+]
+junit_family="legacy"
+testpaths = [
+   "terminusdb_client/tests/",
+]
+
+[tool.isort]
+profile = "black"
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+combine_as_imports = true
+line_length = 88

makefile

@@ -369,6 +369,27 @@ def _obj_to_dict(self, skip_checking=False):
         return (result, references)
 
 
+# starting in python 3.11, enums can't really be defined with
+# non-unique values anymore. Since that is an established pattern for
+# us, we have to put some effort into making those enum values unique.
+def transform_enum_dict(d):
+    "Ensure that all enums in a definition have a unique value by transforming those that have no value set to have their stringified name as a value"
+    new_dict = {}
+    for key, value in d.items():
+        if not key.startswith("__") and not value:
+            value = str(key)
+            # remove this value from the undocumented member names list
+            if type(d._member_names) == list:
+                d._member_names.remove(key)
+            else:
+                d._member_names.pop(key)
+            new_dict[key] = value
+
+    for key, value in new_dict.items():
+        d.pop(key)
+        d[key] = value
+
+
 class EnumMetaTemplate(EnumMeta):
     def __new__(
         metacls,
@@ -382,13 +403,26 @@ def __new__(
     ):
         if "_schema" in classdict:
             schema = classdict.pop("_schema")
-            classdict._member_names.remove("_schema")
+
+            # _member_names is a field maintained in the enum dict
+            # that keeps track of fields to prevent
+            # duplicates. Unfortunately, since we're messing with
+            # definitions here, we'll have to reach into internals
+            # like this to keep things working well.
+            # There is probably a better way to do this.
+            if type(classdict._member_names) == list:
+                classdict._member_names.remove("_schema")
+            else:
+                classdict._member_names.pop("_schema")
+
+            transform_enum_dict(classdict)
             new_cls = super().__new__(metacls, cls, bases, classdict)
             new_cls._schema = schema
             if not hasattr(schema, "object"):
                 schema.object = {}
             schema.object[cls] = new_cls
         else:
+            transform_enum_dict(classdict)
             new_cls = super().__new__(metacls, cls, bases, classdict)
         globals()[cls] = new_cls
         return new_cls

poetry.lock

@@ -9,6 +9,7 @@
 from terminusdb_client.client import Client
 from terminusdb_client.schema.schema import (
     DocumentTemplate,
+    EnumTemplate,
     Schema,
     _check_cycling,
 )
@@ -450,3 +451,16 @@ def test_from_json_schema():
 #     other_schema.delete_property(Title)
 #     assert other_schema.all_obj() == {Employee, Address, Team}
 #     assert other_schema.all_prop() == {AddressOf, PostCode, Country}
+
+
+class AnEnum(EnumTemplate):
+    "An enum"
+    _schema = Schema()
+    Foo = ()
+    Bar = ()
+    Baz = ()
+
+
+def test_simple_enum():
+    assert AnEnum.Foo.name == "Foo"
+    assert AnEnum.Foo.value == "Foo"