Merge pull request #143 from specklesystems/izzy/commits-hotfix

fix(client): add `branchName` to commits query
feat(models): add branchName to commit repr
2021-12-10 11:50:24 +00:00 · 2021-12-10 11:44:07 +00:00 · 2021-12-10 11:40:03 +00:00 · 2021-11-30 11:52:09 +00:00 · 2021-11-30 11:50:34 +00:00 · 2021-11-24 18:56:11 +01:00
7 changed files with 556 additions and 291 deletions
@@ -2,14 +2,15 @@ version: 2.1

 orbs:
  python: circleci/python@1.3.2
+  codecov: codecov/codecov@3.2.2

 jobs:
  test:
    docker:
      - image: "cimg/python:<<parameters.tag>>"
-      - image: "circleci/node:12"
-      - image: "circleci/redis:6"
-      - image: "circleci/postgres:12"
+      - image: 'cimg/node:14.18'
+      - image: 'circleci/redis:6'
+      - image: 'cimg/postgres:12.8'
        environment:
          POSTGRES_DB: speckle2_test
          POSTGRES_PASSWORD: speckle
@@ -38,7 +39,15 @@ jobs:
          name: upgrade pip
      - python/install-packages:
          pkg-manager: poetry
-      - run: poetry run pytest
+      - run: poetry run pytest --cov --cov-report xml:reports/coverage.xml --junitxml=reports/test-results.xml
+
+      - store_test_results:
+          path: reports
+
+      - store_artifacts:
+          path: reports
+
+      - codecov/upload

  deploy:
    docker:
@@ -1,4 +1,6 @@
 .tool-versions
+.envrc
+reports/

 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -8,7 +8,9 @@
 <p align="center"><b>Speckle</b> is the data infrastructure for the AEC industry.</p><br/>

 <p align="center"><a href="https://twitter.com/SpeckleSystems"><img src="https://img.shields.io/twitter/follow/SpeckleSystems?style=social" alt="Twitter Follow"></a> <a href="https://speckle.community"><img src="https://img.shields.io/discourse/users?server=https%3A%2F%2Fspeckle.community&amp;style=flat-square&amp;logo=discourse&amp;logoColor=white" alt="Community forum users"></a> <a href="https://speckle.systems"><img src="https://img.shields.io/badge/https://-speckle.systems-royalblue?style=flat-square" alt="website"></a> <a href="https://speckle.guide/dev/"><img src="https://img.shields.io/badge/docs-speckle.guide-orange?style=flat-square&amp;logo=read-the-docs&amp;logoColor=white" alt="docs"></a></p>
-<p align="center"><a href="https://github.com/specklesystems/specklepy/"><img src="https://circleci.com/gh/specklesystems/specklepy.svg?style=svg&amp;circle-token=76eabd350ea243575cbb258b746ed3f471f7ac29" alt="Speckle-Next"></a> </p>
+<p align="center"><a href="https://github.com/specklesystems/specklepy/"><img src="https://circleci.com/gh/specklesystems/specklepy.svg?style=svg&amp;circle-token=76eabd350ea243575cbb258b746ed3f471f7ac29" alt="Speckle-Next"></a><a href="https://codecov.io/gh/specklesystems/specklepy">
+  <img src="https://codecov.io/gh/specklesystems/specklepy/branch/main/graph/badge.svg?token=8KQFL5N0YF"/>
+</a> </p>

 # About Speckle

@@ -12,16 +12,17 @@ homepage = "https://speckle.systems/"

 [tool.poetry.dependencies]
 python = "^3.6.5"
-pydantic = "^1.7.3"
+pydantic = "^1.8.2"
 appdirs = "^1.4.4"
-gql = {version = ">=3.0.0a6", extras = ["all"], allow-prereleases = true}
-ujson = "^4.1.0"
+gql = {version = ">=3.0.0b1", extras = ["all"], allow-prereleases = true}
+ujson = "^4.3.0"

 [tool.poetry.dev-dependencies]
 black = "^20.8b1"
 isort = "^5.7.0"
 pytest = "^6.2.2"
 pytest-ordering = "^0.6"
+pytest-cov = "^3.0.0"


 [tool.black]
@@ -30,7 +30,7 @@ class Commit(BaseModel):
    parents: Optional[List[str]]

    def __repr__(self) -> str:
-        return f"Commit( id: {self.id}, message: {self.message}, referencedObject: {self.referencedObject}, authorName: {self.authorName}, createdAt: {self.createdAt} )"
+        return f"Commit( id: {self.id}, message: {self.message}, referencedObject: {self.referencedObject}, authorName: {self.authorName}, branchName: {self.branchName}, createdAt: {self.createdAt} )"

    def __str__(self) -> str:
        return self.__repr__()
@@ -34,8 +34,8 @@ class Resource(ResourceBase):
                stream(id: $stream_id) {
                    commit(id: $commit_id) {
                        id
-                        referencedObject
                        message
+                        referencedObject
                        authorId
                        authorName
                        authorAvatar
@@ -79,6 +79,7 @@ class Resource(ResourceBase):
                            authorId
                            authorName
                            authorAvatar
+                            branchName
                            createdAt
                            sourceApplication
                            totalChildrenCount
Author	SHA1	Message	Date
izzy lyseggen	b0de9e31b5	Merge pull request #143 from specklesystems/izzy/commits-hotfix fix(client): add `branchName` to commits query	2021-12-10 11:50:24 +00:00
izzy lyseggen	2075783134	feat(models): add branchName to commit repr	2021-12-10 11:44:07 +00:00
izzy lyseggen	071f2449c3	fix(client): oopsie missing field in `commit.list` thanks @mortenengen for the spot! closes #142	2021-12-10 11:40:03 +00:00
izzy lyseggen	a419664461	Merge pull request #140 from specklesystems/izzy/bump-deps chore: update deps	2021-11-30 11:52:09 +00:00
izzy lyseggen	4a0c07009b	chore: update deps	2021-11-30 11:50:34 +00:00
Gergő Jedlicska	682bcbfa9f	Merge pull request #138 from specklesystems/gergo/ci_test_report add codecov badge	2021-11-24 18:56:11 +01:00
Gergő Jedlicska	ccf284e8fa	add codecov badge	2021-11-24 18:53:44 +01:00
Gergő Jedlicska	23102a28ff	Merge pull request #137 from specklesystems/gergo/ci_test_report add circle_ci reporting	2021-11-24 18:46:25 +01:00
Gergő Jedlicska	5475edb253	coverage report to xml	2021-11-24 18:28:36 +01:00
Gergő Jedlicska	c52f80c1ef	add codecov upload	2021-11-24 18:21:39 +01:00
Gergő Jedlicska	21eecfa24c	add circle_ci reporting	2021-11-24 16:47:48 +01:00