clintmod · clintmod · Jul 16, 2026 · Jul 16, 2026 · Jul 16, 2026 · Jul 16, 2026
diff --git a/README.md b/README.md
@@ -161,6 +161,7 @@ chmod -R o=-x ~/Dropbox
 - Fork and clone then cd to this git repository
 - Install [mise](https://mise.jdx.dev/) if you don't have it: `curl https://mise.run | sh`
 - Run `mise install` — installs the pinned toolchain (python, [uv](https://docs.astral.sh/uv/), and the [rite](https://github.com/clintmod/rite) task runner)
+- If mise isn't [activated in your shell](https://mise.jdx.dev/getting-started.html#activate-mise), prefix the commands below with `mise exec --` (e.g. `mise exec -- rite setup`)
 - Run `rite setup` — creates `.venv` and installs the dev dependencies from `uv.lock`
 
 Run `rite` (no arguments) to list all available tasks.

diff --git a/Ritefile.yml b/Ritefile.yml
@@ -32,7 +32,7 @@ tasks:
     aliases: [t]
     deps: [setup]
     cmds:
-      - uv run pytest --cov=. --cov-report xml:cov.xml --cov-report term-missing
+      - uv run pytest --cov=src --cov-report xml:cov.xml --cov-report term-missing
 
   test:watch:
     desc: Re-run tests on file changes
@@ -46,7 +46,9 @@ tasks:
     aliases: [l]
     deps: [setup]
     cmds:
-      - uv run pylint *.py
+      # src/macprefs is listed explicitly: it has no .py extension, so the
+      # glob misses it, but pylint lints any file passed by name.
+      - uv run pylint src/*.py src/macprefs tests/*.py
 
   build:
     desc: Build the brew package from committed HEAD, install, verify, uninstall
@@ -66,7 +68,7 @@ tasks:
     aliases: [p]
     deps: [test]
     cmds:
-      - uv run python publish.py
+      - uv run python src/publish.py
 
   teardown:
     desc: Remove the local dev environment (counterpart to setup)

diff --git a/ci/scripts/brew-build-test.sh b/ci/scripts/brew-build-test.sh
@@ -7,7 +7,7 @@
 # the real install) unless FORCE=1 is set.
 set -euo pipefail
 
-VERSION=$(python3 -c "import version; print(version.__version__.lstrip('v'))")
+VERSION=$(PYTHONPATH=src python3 -c "import version; print(version.__version__.lstrip('v'))")
 TMP=$(mktemp -d)
 trap 'rm -rf "$TMP"' EXIT
 

diff --git a/macprefs.template.rb b/macprefs.template.rb
@@ -7,7 +7,7 @@ class Macprefs < Formula
   depends_on "python@3.13"
 
   def install
-    libexec.install Dir["*"]
+    libexec.install Dir["src/*"]
     bin.write_exec_script libexec/"macprefs"
   end
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -25,6 +25,8 @@ package = false
 [tool.pytest.ini_options]
 addopts = "--maxfail=2 -s --tb=native -v -m 'not integration'"
 markers = ["integration: integration tests"]
+pythonpath = ["src"]
+testpaths = ["tests"]
 
 [tool.pylint.main]
 jobs = 1

diff --git a/app_store_preferences.py → src/app_store_preferences.py b/app_store_preferences.py → src/app_store_preferences.py
diff --git a/config.py → src/config.py b/config.py → src/config.py
diff --git a/dotfiles.py → src/dotfiles.py b/dotfiles.py → src/dotfiles.py
diff --git a/internet_accounts.py → src/internet_accounts.py b/internet_accounts.py → src/internet_accounts.py
diff --git a/macprefs → src/macprefs b/macprefs → src/macprefs
@@ -68,7 +68,7 @@ def restore(choices=[]):
 
 def invoke_func(args):
     if args.func is not None:
-        if args.name == 'backup' or args.name == 'restore':
+        if args.name in ('backup', 'restore'):
             args.func(args.t)
         else:
             args.func()

diff --git a/preferences.py → src/preferences.py b/preferences.py → src/preferences.py
diff --git a/publish.py → src/publish.py b/publish.py → src/publish.py
diff --git a/shared_file_lists.py → src/shared_file_lists.py b/shared_file_lists.py → src/shared_file_lists.py
diff --git a/ssh_files.py → src/ssh_files.py b/ssh_files.py → src/ssh_files.py
diff --git a/startup_items.py → src/startup_items.py b/startup_items.py → src/startup_items.py
diff --git a/system_preferences.py → src/system_preferences.py b/system_preferences.py → src/system_preferences.py
diff --git a/utils.py → src/utils.py b/utils.py → src/utils.py
diff --git a/version.py → src/version.py b/version.py → src/version.py
diff --git a/test_app_store_preferences.py → tests/test_app_store_preferences.py b/test_app_store_preferences.py → tests/test_app_store_preferences.py
diff --git a/test_config.py → tests/test_config.py b/test_config.py → tests/test_config.py
diff --git a/test_dotfiles.py → tests/test_dotfiles.py b/test_dotfiles.py → tests/test_dotfiles.py
diff --git a/test_internet_accounts.py → tests/test_internet_accounts.py b/test_internet_accounts.py → tests/test_internet_accounts.py
diff --git a/test_macprefs.py → tests/test_macprefs.py b/test_macprefs.py → tests/test_macprefs.py
@@ -6,14 +6,14 @@
 import utils
 
 # load as module
-macprefs = utils.execute_module('macprefs', 'macprefs')
+macprefs = utils.execute_module('macprefs', 'src/macprefs')
 
 @patch('sys.stdout', new_callable=StringIO)
 def test_invoke_help(mock_stdout):
     try:
         sys.argv = ['macprefs', '-h']
         # invoke as script
-        utils.execute_module('__main__', 'macprefs')
+        utils.execute_module('__main__', 'src/macprefs')
         assert False, 'expected SystemExit'
     except SystemExit as e:
         assert_correct_std_out(e, mock_stdout)
@@ -48,7 +48,7 @@ def test_invoke_no_args(mock_stdout):
     try:
         sys.argv = ['macprefs']
         # invoke as script
-        utils.execute_module('__main__', 'macprefs')
+        utils.execute_module('__main__', 'src/macprefs')
         assert False, 'expected SystemExit'
     except SystemExit as e:
         assert_correct_std_out(e, mock_stdout)
@@ -126,7 +126,7 @@ def test_intergration():
     try:
         sys.argv = ['macprefs', 'backup']
         # invoke as script
-        utils.execute_module('__main__', 'macprefs')
+        utils.execute_module('__main__', 'src/macprefs')
         assert False, 'expected SystemExit'
     except SystemExit as e:
         assert e.code == 0
@@ -137,7 +137,7 @@ def test_restore_intergration():
     try:
         sys.argv = ['macprefs', 'restore']
         # invoke as script
-        utils.execute_module('__main__', 'macprefs')
+        utils.execute_module('__main__', 'src/macprefs')
         assert False, 'expected SystemExit'
     except SystemExit as e:
         assert e.code == 0 '''
diff --git a/test_preferences.py → tests/test_preferences.py b/test_preferences.py → tests/test_preferences.py
diff --git a/test_publish.py → tests/test_publish.py b/test_publish.py → tests/test_publish.py
@@ -12,7 +12,7 @@ def test_invoke_help():
     old_argv = sys.argv
     sys.argv = ['publish', '-test']
     # invoke as script
-    utils.execute_module('__main__', 'publish.py')
+    utils.execute_module('__main__', 'src/publish.py')
     sys.argv = old_argv
 
 

diff --git a/test_shared_file_lists.py → tests/test_shared_file_lists.py b/test_shared_file_lists.py → tests/test_shared_file_lists.py
diff --git a/test_ssh_files.py → tests/test_ssh_files.py b/test_ssh_files.py → tests/test_ssh_files.py
diff --git a/test_startup_items.py → tests/test_startup_items.py b/test_startup_items.py → tests/test_startup_items.py
diff --git a/test_system_preferences.py → tests/test_system_preferences.py b/test_system_preferences.py → tests/test_system_preferences.py
diff --git a/test_utils.py → tests/test_utils.py b/test_utils.py → tests/test_utils.py