Migrate to src layout

paulfioravanti · Oct 3, 2024 · 9e281e6 · 9e281e6
1 parent e80ba27
commit 9e281e6
Show file tree

Hide file tree

Showing 19 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,10 +28,10 @@ jobs:
           python -m pip install git+https://git@github.com/1Password/onepassword-sdk-python.git@v0.1.1
 
       - name: Run Linter
-        run: pylint plover_1password
+        run: pylint src
 
       - name: Run Type Checker
-        run: mypy plover_1password
+        run: mypy src
 
       - name: Run Tests
         run: pytest

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,10 +28,10 @@ jobs:
           python -m pip install git+https://git@github.com/1Password/onepassword-sdk-python.git@v0.1.1
 
       - name: Run Linter
-        run: pylint plover_1password
+        run: pylint src
 
       - name: Run Type Checker
-        run: mypy plover_1password
+        run: mypy src
 
       - name: Run Tests
         run: pytest

diff --git a/pytest.ini b/pytest.ini
@@ -1,3 +1,4 @@
 [pytest]
 asyncio_default_fixture_loop_scope = function
 asyncio_mode = auto
+pythonpath = src
diff --git a/setup.cfg b/setup.cfg
@@ -23,12 +23,9 @@ install_requires =
     plover >= 4.0.0.dev12
 setup_requires =
     setuptools >= 30.3.0
-packages =
-    plover_1password
-    plover_1password.secret
-    plover_1password.secret_reference
-    plover_1password.service_account
-    plover_1password.shell_command
+package_dir =
+    = src
+packages = find:
 
 [options.entry_points]
 plover.extension =
@@ -44,6 +41,9 @@ test =
     pytest-cov
     pytest-mock
 
+[options.packages.find]
+where = src
+
 [tool:pytest]
 pythonpath = plover_1password
 

diff --git a/plover_1password/__init__.py → src/plover_1password/__init__.py b/plover_1password/__init__.py → src/plover_1password/__init__.py
diff --git a/plover_1password/__version__.py → src/plover_1password/__version__.py b/plover_1password/__version__.py → src/plover_1password/__version__.py
@@ -2,4 +2,4 @@
 Version attribute
 """
 
-__version__ = "0.3.17"
+__version__ = "0.3.18"
diff --git a/plover_1password/extension.py → src/plover_1password/extension.py b/plover_1password/extension.py → src/plover_1password/extension.py
diff --git a/plover_1password/secret/__init__.py → src/plover_1password/secret/__init__.py b/plover_1password/secret/__init__.py → src/plover_1password/secret/__init__.py
diff --git a/plover_1password/secret/client.py → src/plover_1password/secret/client.py b/plover_1password/secret/client.py → src/plover_1password/secret/client.py
diff --git a/plover_1password/secret/error.py → src/plover_1password/secret/error.py b/plover_1password/secret/error.py → src/plover_1password/secret/error.py
diff --git a/plover_1password/secret/resolver.py → src/plover_1password/secret/resolver.py b/plover_1password/secret/resolver.py → src/plover_1password/secret/resolver.py
diff --git a/...er_1password/secret_reference/__init__.py → ...er_1password/secret_reference/__init__.py b/...er_1password/secret_reference/__init__.py → ...er_1password/secret_reference/__init__.py
diff --git a/...er_1password/secret_reference/expander.py → ...er_1password/secret_reference/expander.py b/...er_1password/secret_reference/expander.py → ...er_1password/secret_reference/expander.py
diff --git a/plover_1password/service_account/__init__.py → ...ver_1password/service_account/__init__.py b/plover_1password/service_account/__init__.py → ...ver_1password/service_account/__init__.py
diff --git a/plover_1password/service_account/token.py → ...plover_1password/service_account/token.py b/plover_1password/service_account/token.py → ...plover_1password/service_account/token.py
diff --git a/plover_1password/shell_command/__init__.py → ...lover_1password/shell_command/__init__.py b/plover_1password/shell_command/__init__.py → ...lover_1password/shell_command/__init__.py
diff --git a/plover_1password/shell_command/resolver.py → ...lover_1password/shell_command/resolver.py b/plover_1password/shell_command/resolver.py → ...lover_1password/shell_command/resolver.py
diff --git a/plover_1password/shell_command/runner.py → src/plover_1password/shell_command/runner.py b/plover_1password/shell_command/runner.py → src/plover_1password/shell_command/runner.py
diff --git a/test/justfile b/test/justfile
@@ -10,7 +10,7 @@ coverage:
   open htmlcov/index.html
 
 lint:
-  pylint plover_1password
+  pylint src
 
 typecheck:
-  mypy plover_1password
+  mypy src