More type fixes

meltano · Jan 30, 2024 · 2048cf5 · 2048cf5
1 parent 209ab6f
commit 2048cf5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 54 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -137,7 +137,7 @@ addopts = '--ignore=singer_sdk/helpers/_simpleeval.py -m "not external"'
 filterwarnings = [
     "error",
     "ignore:Could not configure external gitlab tests:UserWarning",
-    "ignore:No records were available to test:UserWarning:singer_sdk.testing.templates",
+    "ignore:No records were available to test:UserWarning",
     # https://github.com/meltano/sdk/issues/1354
     "ignore:The function singer_sdk.testing.get_standard_tap_tests is deprecated:DeprecationWarning",
     # https://docs.python.org/3.12/whatsnew/3.12.html#deprecated

diff --git a/samples/sample_tap_gitlab/gitlab_rest_streams.py b/samples/sample_tap_gitlab/gitlab_rest_streams.py
@@ -104,13 +104,6 @@ class ProjectsStream(ProjectBasedStream):
     is_sorted = True
     schema_filepath = SCHEMAS_DIR / "projects.json"
 
-    def get_url_params(
-        self, context: dict | None, next_page_token: str | None
-    ) -> dict[str, t.Any]:
-        params = super().get_url_params(context, next_page_token)
-        params["statistics"] = True
-        return params
-
 
 class ReleasesStream(ProjectBasedStream):
     """Gitlab Releases stream."""

diff --git a/samples/sample_tap_gitlab/schemas/issues.json b/samples/sample_tap_gitlab/schemas/issues.json
@@ -36,7 +36,7 @@
             "null",
             "string"
           ],
-          "format": "date-time"
+          "format": "date"
         },
         "iid": {
           "type": "integer"
@@ -173,11 +173,37 @@
         }
       }
     },
-    "closed_by_id": {
+    "closed_by": {
       "type": [
         "null",
-        "integer"
-      ]
+        "object"
+      ],
+      "properties": {
+        "state": {
+          "type": "string"
+        },
+        "id": {
+          "type": "integer"
+        },
+        "name": {
+          "type": "string"
+        },
+        "web_url": {
+          "type": [
+            "null",
+            "string"
+          ]
+        },
+        "avatar_url": {
+          "type": [
+            "null",
+            "string"
+          ]
+        },
+        "username": {
+          "type": "string"
+        }
+      }
     },
     "title": {
       "type": [
@@ -236,12 +262,6 @@
         }
       ]
     },
-    "subscribed": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    },
     "upvotes": {
       "type": [
         "null",
@@ -270,7 +290,8 @@
       "type": [
         "null",
         "string"
-      ]
+      ],
+      "format": "date"
     },
     "weight": {
       "type": [

diff --git a/samples/sample_tap_gitlab/schemas/projects.json b/samples/sample_tap_gitlab/schemas/projects.json
@@ -93,21 +93,6 @@
     "open_issues_count": {
       "type": ["null", "integer"]
     },
-    "owner": {
-      "type": ["null", "object"],
-      "properties": {
-        "id": {
-          "type": ["null", "integer"]
-        },
-        "name": {
-          "type": ["null", "string"]
-        },
-        "created_at": {
-          "type": ["null", "string"],
-          "format": "date-time"
-        }
-      }
-    },
     "path": {
       "type": ["null", "string"]
     },
@@ -176,26 +161,6 @@
     "star_count": {
       "type": ["null", "integer"]
     },
-    "statistics": {
-      "type": ["object", "null"],
-      "properties": {
-        "commit_count": {
-          "type": ["null", "integer"]
-        },
-        "storage_size": {
-          "type": ["null", "integer"]
-        },
-        "repository_size": {
-          "type": ["null", "integer"]
-        },
-        "lfs_objects_size": {
-          "type": ["null", "integer"]
-        },
-        "job_artifacts_size": {
-          "type": ["null", "integer"]
-        }
-      }
-    },
     "tag_list": {
       "type": ["array", "null"],
       "items": {