Transition to src layout`

rmartin16 · Mar 25, 2023 · d950c1b · d950c1b
1 parent d73f5a0
commit d950c1b
Show file tree

Hide file tree

Showing 37 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -82,8 +82,8 @@ jobs:
         include:
           - IS_QBT_DEV: false
           # test dev versions of qBittorrent
-#          - QBT_VER: "master"
-#            IS_QBT_DEV: true
+          - QBT_VER: "master"
+            IS_QBT_DEV: true
           - QBT_VER: "v4_5_x"
             IS_QBT_DEV: true
           - QBT_VER: "v4_4_x"
@@ -140,7 +140,7 @@ jobs:
       runner-os: ${{ matrix.OS_VER }}
 
   coverage:
-    name: Combine & check coverage.
+    name: Combine & Check Coverage
     runs-on: ubuntu-latest
     needs: [Tests-qBittorrent, Tests-Python]
     steps:

diff --git a/pyproject.toml b/pyproject.toml
@@ -42,11 +42,12 @@ parallel = true
 branch = true
 relative_files = true
 source_pkgs = ["qbittorrentapi"]
-omit = ["qbittorrentapi/_attrdict.py"]
+omit = ["**/_attrdict.py"]
 
 [tool.coverage.paths]
 source = [
-    "qbittorrentapi",
+    "src",
+    "**/site-packages",
 ]
 
 [tool.coverage.report]

diff --git a/setup.cfg b/setup.cfg
@@ -48,6 +48,8 @@ platforms = any
 zip_safe = False
 packages = find:
 include_package_data = True
+package_dir =
+    = src
 install_requires =
     backports.functools-lru-cache; python_version < "3.3"
     enum34; python_version < "3"
@@ -77,5 +79,8 @@ dev =
     types-requests
     types-six
 
+[options.packages.find]
+where = src
+
 [bdist_wheel]
 universal = 1
diff --git a/qbittorrentapi/__init__.py → src/qbittorrentapi/__init__.py b/qbittorrentapi/__init__.py → src/qbittorrentapi/__init__.py
diff --git a/qbittorrentapi/_attrdict.py → src/qbittorrentapi/_attrdict.py b/qbittorrentapi/_attrdict.py → src/qbittorrentapi/_attrdict.py
diff --git a/qbittorrentapi/_attrdict.pyi → src/qbittorrentapi/_attrdict.pyi b/qbittorrentapi/_attrdict.pyi → src/qbittorrentapi/_attrdict.pyi
diff --git a/qbittorrentapi/_types.pyi → src/qbittorrentapi/_types.pyi b/qbittorrentapi/_types.pyi → src/qbittorrentapi/_types.pyi
diff --git a/qbittorrentapi/_version_support.py → src/qbittorrentapi/_version_support.py b/qbittorrentapi/_version_support.py → src/qbittorrentapi/_version_support.py
diff --git a/qbittorrentapi/_version_support.pyi → src/qbittorrentapi/_version_support.pyi b/qbittorrentapi/_version_support.pyi → src/qbittorrentapi/_version_support.pyi
diff --git a/qbittorrentapi/app.py → src/qbittorrentapi/app.py b/qbittorrentapi/app.py → src/qbittorrentapi/app.py
diff --git a/qbittorrentapi/app.pyi → src/qbittorrentapi/app.pyi b/qbittorrentapi/app.pyi → src/qbittorrentapi/app.pyi
diff --git a/qbittorrentapi/auth.py → src/qbittorrentapi/auth.py b/qbittorrentapi/auth.py → src/qbittorrentapi/auth.py
diff --git a/qbittorrentapi/auth.pyi → src/qbittorrentapi/auth.pyi b/qbittorrentapi/auth.pyi → src/qbittorrentapi/auth.pyi
diff --git a/qbittorrentapi/client.py → src/qbittorrentapi/client.py b/qbittorrentapi/client.py → src/qbittorrentapi/client.py
diff --git a/qbittorrentapi/client.pyi → src/qbittorrentapi/client.pyi b/qbittorrentapi/client.pyi → src/qbittorrentapi/client.pyi
diff --git a/qbittorrentapi/decorators.py → src/qbittorrentapi/decorators.py b/qbittorrentapi/decorators.py → src/qbittorrentapi/decorators.py
diff --git a/qbittorrentapi/decorators.pyi → src/qbittorrentapi/decorators.pyi b/qbittorrentapi/decorators.pyi → src/qbittorrentapi/decorators.pyi
diff --git a/qbittorrentapi/definitions.py → src/qbittorrentapi/definitions.py b/qbittorrentapi/definitions.py → src/qbittorrentapi/definitions.py
diff --git a/qbittorrentapi/definitions.pyi → src/qbittorrentapi/definitions.pyi b/qbittorrentapi/definitions.pyi → src/qbittorrentapi/definitions.pyi
diff --git a/qbittorrentapi/exceptions.py → src/qbittorrentapi/exceptions.py b/qbittorrentapi/exceptions.py → src/qbittorrentapi/exceptions.py
diff --git a/qbittorrentapi/exceptions.pyi → src/qbittorrentapi/exceptions.pyi b/qbittorrentapi/exceptions.pyi → src/qbittorrentapi/exceptions.pyi
diff --git a/qbittorrentapi/log.py → src/qbittorrentapi/log.py b/qbittorrentapi/log.py → src/qbittorrentapi/log.py
diff --git a/qbittorrentapi/log.pyi → src/qbittorrentapi/log.pyi b/qbittorrentapi/log.pyi → src/qbittorrentapi/log.pyi
diff --git a/qbittorrentapi/py.typed → src/qbittorrentapi/py.typed b/qbittorrentapi/py.typed → src/qbittorrentapi/py.typed
diff --git a/qbittorrentapi/request.py → src/qbittorrentapi/request.py b/qbittorrentapi/request.py → src/qbittorrentapi/request.py
diff --git a/qbittorrentapi/request.pyi → src/qbittorrentapi/request.pyi b/qbittorrentapi/request.pyi → src/qbittorrentapi/request.pyi
diff --git a/qbittorrentapi/rss.py → src/qbittorrentapi/rss.py b/qbittorrentapi/rss.py → src/qbittorrentapi/rss.py
diff --git a/qbittorrentapi/rss.pyi → src/qbittorrentapi/rss.pyi b/qbittorrentapi/rss.pyi → src/qbittorrentapi/rss.pyi
diff --git a/qbittorrentapi/search.py → src/qbittorrentapi/search.py b/qbittorrentapi/search.py → src/qbittorrentapi/search.py
diff --git a/qbittorrentapi/search.pyi → src/qbittorrentapi/search.pyi b/qbittorrentapi/search.pyi → src/qbittorrentapi/search.pyi
diff --git a/qbittorrentapi/sync.py → src/qbittorrentapi/sync.py b/qbittorrentapi/sync.py → src/qbittorrentapi/sync.py
diff --git a/qbittorrentapi/sync.pyi → src/qbittorrentapi/sync.pyi b/qbittorrentapi/sync.pyi → src/qbittorrentapi/sync.pyi
diff --git a/qbittorrentapi/torrents.py → src/qbittorrentapi/torrents.py b/qbittorrentapi/torrents.py → src/qbittorrentapi/torrents.py
diff --git a/qbittorrentapi/torrents.pyi → src/qbittorrentapi/torrents.pyi b/qbittorrentapi/torrents.pyi → src/qbittorrentapi/torrents.pyi
diff --git a/qbittorrentapi/transfer.py → src/qbittorrentapi/transfer.py b/qbittorrentapi/transfer.py → src/qbittorrentapi/transfer.py
diff --git a/qbittorrentapi/transfer.pyi → src/qbittorrentapi/transfer.pyi b/qbittorrentapi/transfer.pyi → src/qbittorrentapi/transfer.pyi
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -298,7 +298,7 @@ def delete_feed(name):
         client.app.preferences = dict(rss_auto_downloading_enabled=False)
         # refreshing the feed is finicky...so try several times if necessary
         done = False
-        for i in range(30):
+        for i in range(5):
             delete_feed(name)
             client.rss.add_feed(url=url, item_path=name)
             # refreshing too quickly can cause it to never refresh.