Add tests against live quetz (#2)

* Move live tests here * add dacite * pin sqlalchemy for now * correct path * add config file * clarify scope * adjust scope * adjust scope * test something * test something * Abort if server couldn't start * pls work * switch path * precommit * add more live tests * passing tests! * path * more live tests * more live tests * more live tests * more live tests * more live tests * cmon * cleanup * sqlalchemy * Update tests/conftest.py Co-authored-by: Jan-Benedikt Jagusch <[email protected]> * feedback * Separate into mock, live, and both * feedback * remove sqlalchemy pin * invalidate cache * use cache again * Update .github/workflows/ci.yml Co-authored-by: Jan-Benedikt Jagusch <[email protected]> * precommit * remove old test file * fix mock test * Update .github/workflows/ci.yml Co-authored-by: Jan-Benedikt Jagusch <[email protected]> * sync dependencies --------- Co-authored-by: Jan-Benedikt Jagusch <[email protected]>
mamba-org · Mar 1, 2023 · 0b113b4 · 0b113b4
1 parent de8cb8b
commit 0b113b4
Show file tree

Hide file tree

Showing 9 changed files with 601 additions and 297 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,6 +27,10 @@ jobs:
             pytest-md
             pytest-emoji
 
+      - name: Install quetz
+        run: |
+          micromamba install -c conda-forge 'quetz>=0.6.1'
+
       - name: Install quetz-client
         run: |
           pip install -e .

diff --git a/environment.yml b/environment.yml
@@ -13,11 +13,14 @@ dependencies:
   - sphinx
   - sphinxcontrib-apidoc
   - sphinx_rtd_theme
+  - tbump
   - quetz >=0.6.1
   - pytest-mock
   - requests-mock
   - httpx
+  # Runtime dependencies
   - fire
-  - tbump
+  - requests
+  - dacite
   - pip:
       - git+https://github.com/jupyter-server/jupyter_releaser.git@v2
diff --git a/setup.cfg b/setup.cfg
@@ -18,6 +18,7 @@ include_package_data = true
 install_requires =
     fire
     requests
+    dacite
 python_requires = >=3.8
 package_dir=
     =src

diff --git a/src/quetz_client/client.py b/src/quetz_client/client.py
@@ -2,9 +2,10 @@
 from dataclasses import dataclass
 from itertools import count
 from pathlib import Path
-from typing import Dict, Iterator, List, Mapping, Optional, Union
+from typing import Dict, Iterator, List, Optional, Union
 
 import requests
+from dacite import from_dict
 
 
 @dataclass(frozen=True)
@@ -21,16 +22,22 @@ class Channel:
 
 
 @dataclass(frozen=True)
-class ChannelMember:
-    username: str
-    role: str
+class Profile:
+    name: str
+    avatar_url: str
 
 
 @dataclass(frozen=True)
 class User:
     id: str
     username: str
-    profile: Mapping
+    profile: Profile
+
+
+@dataclass(frozen=True)
+class ChannelMember:
+    user: User
+    role: str
 
 
 @dataclass(frozen=True)
@@ -91,7 +98,7 @@ def yield_channel_members(self, channel: str) -> Iterator[ChannelMember]:
         response = self.session.get(url=url)
         response.raise_for_status()
         for member_json in response.json():
-            yield ChannelMember(**member_json)
+            yield from_dict(ChannelMember, member_json)
 
     def yield_users(self, query: str = "", limit: int = 20) -> Iterator[User]:
         url = f"{self.url}/api/paginated/users"