Merge remote-tracking branch 'origin/master' into fix/update-test-configuration

Author: hoijnet

CONTRIBUTING.md

@@ -4,7 +4,7 @@ Thanks for interested to contribute to TerminusDB Client, to get started, fork t
 
 ## Setting up dev environment 💻
 
-Make sure you have Python>=3.6 installed. We use [pipenv](https://pipenv-fork.readthedocs.io/en/latest/) for dev environment, to install pipenv:
+Make sure you have Python>=3.8 installed. We use [pipenv](https://pipenv-fork.readthedocs.io/en/latest/) for dev environment, to install pipenv:
 
 `pip3 install pipenv --upgrade`
 

README.md

@@ -33,7 +33,7 @@ graph all through a simple document API.
 ## Requirements
 
 - [TerminusDB v10.0](https://github.com/terminusdb/terminusdb-server)
-- [Python >=3.7](https://www.python.org/downloads)
+- [Python >=3.8](https://www.python.org/downloads)
 
 ## Release Notes and Previous Versions
 

poetry.lock

@@ -1717,7 +1717,7 @@ def pull(
     def fetch(self, remote_id: str,
               remote_auth: Optional[dict] = None,
               ) -> dict:
-        """Fatch the brach from a remote
+        """Fetch the branch from a remote repo
 
         Parameters
         ----------
@@ -2932,6 +2932,7 @@ def has_database(self, dbid: str, team: Optional[str] = None) -> bool:
             f"{self.api}/db/{team}/{dbid}",
             headers=self._default_headers,
             auth=self._auth(),
+            allow_redirects=True,
         )
         return r.status_code == 200
 

terminusdb_client/client/Client.py

@@ -0,0 +1,4 @@
+from terminusdb_client.scripts.scripts import tdbpy
+
+if __name__ == '__main__':
+    tdbpy()

terminusdb_client/scripts/__main__.py

@@ -79,7 +79,8 @@ def docker_url_jwt(pytestconfig):
     pytestconfig.getoption("docker_compose")
     output = subprocess.run(
         [
-            "docker-compose",
+            "docker",
+            "compose",
             "--file",
             os.path.dirname(os.path.realpath(__file__))
             + "/test-docker-compose-jwt.yml",
@@ -98,7 +99,8 @@ def docker_url_jwt(pytestconfig):
     while not is_server_started:
         service = subprocess.run(
             [
-                "docker-compose",
+                "docker",
+                "compose",
                 "--file",
                 os.path.dirname(os.path.realpath(__file__))
                 + "/test-docker-compose-jwt.yml",
@@ -159,7 +161,8 @@ def docker_url(pytestconfig):
     pytestconfig.getoption("docker_compose")
     output = subprocess.run(
         [
-            "docker-compose",
+            "docker",
+            "compose",
             "--file",
             os.path.dirname(os.path.realpath(__file__)) + "/test-docker-compose.yml",
             "up",
@@ -177,7 +180,8 @@ def docker_url(pytestconfig):
     while not is_server_started:
         service = subprocess.run(
             [
-                "docker-compose",
+                "docker",
+                "compose",
                 "--file",
                 os.path.dirname(os.path.realpath(__file__))
                 + "/test-docker-compose.yml",
@@ -214,7 +218,8 @@ def docker_url(pytestconfig):
 def clean_up_container():
     subprocess.run(
         [
-            "docker-compose",
+            "docker",
+            "compose",
             "--file",
             os.path.dirname(os.path.realpath(__file__)) + "/test-docker-compose.yml",
             "down",
@@ -223,7 +228,8 @@ def clean_up_container():
     )
     subprocess.run(
         [
-            "docker-compose",
+            "docker",
+            "compose",
             "--file",
             os.path.dirname(os.path.realpath(__file__)) + "/test-docker-compose.yml",
             "rm",
@@ -235,7 +241,8 @@ def clean_up_container():
     )
     subprocess.run(
         [
-            "docker-compose",
+            "docker",
+            "compose",
             "--file",
             os.path.dirname(os.path.realpath(__file__))
             + "/test-docker-compose-jwt.yml",
@@ -245,7 +252,8 @@ def clean_up_container():
     )
     subprocess.run(
         [
-            "docker-compose",
+            "docker",
+            "compose",
             "--file",
             os.path.dirname(os.path.realpath(__file__))
             + "/test-docker-compose-jwt.yml",
@@ -256,8 +264,8 @@ def clean_up_container():
         ],
         check=True,
     )
-    subprocess.run(["docker-compose", "down"])
-    subprocess.run(["docker-compose", "rm", "--force", "--stop", "-v"])
+    subprocess.run(["docker", "compose", "down"])
+    subprocess.run(["docker", "compose", "rm", "--force", "--stop", "-v"])
 
 
 @pytest.fixture(scope="module")

terminusdb_client/tests/integration_tests/conftest.py

@@ -5,6 +5,7 @@ services:
   terminusdb-server:
     image: terminusdb/terminusdb-server:dev
     container_name: terminusdb-server
+    pull_policy: always
     hostname: terminusdb-server
     tty: true
     ports:

terminusdb_client/tests/integration_tests/test-docker-compose.yml

@@ -1016,7 +1016,7 @@ def removed_triple(self, sub, pred, obj, opt=False):
             return self.opt().triple(sub, pred, obj)
         if self._cursor.get("@type"):
             self._wrap_cursor_with_and()
-        self._cursor["@type"] = "RemovedTriple"
+        self._cursor["@type"] = "DeletedTriple"
         self._cursor["subject"] = self._clean_subject(sub)
         self._cursor["predicate"] = self._clean_predicate(pred)
         self._cursor["object"] = self._clean_object(obj)