Merge pull request #32 from reinout/reinout-modernisation

Setup modernisation + removal of pkg_resources

Author: reinout

.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+max_line_length = 88
+
+[*.{toml,yaml,yml}]
+indent_size = 2
+
+[Makefile]
+indent_style = tab

.github/dependabot.yml

@@ -4,5 +4,4 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      # Check for updates to GitHub Actions every week
-      interval: "weekly"
+      interval: "quarterly"

.github/workflows/test.yaml

@@ -13,16 +13,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.13']
+        python-version: ['3.10', '3.14']
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: make install
-      - name: Check syntax (ruff)
-        run: make check && make beautiful
-      - name: Test (flake8...)
-        run: make test
+      - uses: pre-commit/action@v3.0.1
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+      - name: Install python project
+        run: uv sync
+      - name: Test
+        run: uv run pytest

.gitignore

@@ -1,17 +1,39 @@
+# Pyc/pyo/backup files.
+*.py[co]
+*~
+*.swp
 *.pyc
-*.pyo
-.Python
-.installed.cfg
-bin
-coverage
-develop-eggs
-dist
-eggs
-include
-lib
-parts
-checkoutmanager.egg-info
+.DS_Store
+
+# Packages/buildout/pip/pipenv
+*.egg
+*.egg-info
+sdist
+pip-log.txt
+bower_components/
+node_modules/
+doc/build/
+ansible/*.retry
+.venv
+venv
+bin/
+lib/
+pyvenv.cfg
+dist/
+var/
+*.suggestion
+
+# Unit test / coverage reports
 .coverage
+.tox
 htmlcov
-doc/build/
-/venv/
+.codeintel
+coverage.*
+.pytest_cache
+
+# Pycharm, visual studio
+.idea
+.vscode
+
+# Docker
+docker-compose.override.yml

.pre-commit-config.yaml

@@ -0,0 +1,25 @@
+# See https://nens-meta.readthedocs.io/en/latest/config-files.html
+default_language_version:
+  python: python3
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+        args: [--allow-multiple-documents]
+      - id: check-toml
+      - id: check-added-large-files
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.14.5
+    hooks:
+      # Run the linter.
+      - id: ruff
+        args: ["--fix"]
+      # Run the formatter.
+      - id: ruff-format
+
+### Extra lines below are preserved ###

CHANGES.rst

@@ -4,7 +4,11 @@ Changelog of checkoutmanager
 3.2 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Removed ``pkg_resources`` for compatibility with newer python versions.
+
+- Updated the project itself to use ``uv`` and ``pre-commit``.
+
+- Removed two ancient svn-only commands.
 
 
 3.1 (2025-01-30)

MANIFEST.in

@@ -16,8 +16,8 @@ Checkoutmanager works on linux, osx and windows.
 Starting to use it
 ------------------
 
-Starting is easy.  Just ``pip install checkoutmanager`` and run
-``checkoutmanager``.
+Starting is easy. Just ``pip install checkoutmanager`` (or ``uv tool install
+checkoutmanager``) and run ``checkoutmanager``.
 
 - The first time, you'll get a sample configuration you can copy to
   ``.checkoutmanager.cfg`` in your home directory.
@@ -80,32 +80,6 @@ in
   respective commands and is therefore inherently fragile.
 
 
-
-Hidden commands
----------------
-
-A few commands are hidden because they are seldom used and are only
-useful for subversion.
-
-upgrade
-  This upgrades the working copy to the new subversion 1.7 layout of
-  the .svn directory.  This should be done once after you have
-  upgraded your subversion to 1.7.  Note that when you accidentally
-  run this twice you get an error, but nothing breaks.  Since this
-  command is so rarely needed, it is not advertised in the command
-  line help.
-
-info
-  Display the svn info for the remote url.  This is useful when your
-  svn program has been updated and the security mechanisms on your OS
-  now require you to explictly allow access to the stored credentials.
-  The other commands either do not access the internet or are
-  non-interactive (like command up).  In fact, the reason for adding
-  this command is that a non-interactive 'svn update' will fail when
-  you have not granted access to your credentials yet for this new svn
-  program.  This has happened a bit too often for me (Maurits).
-
-
 Output directory naming
 -----------------------
 
@@ -185,3 +159,13 @@ Config file
    it is in checkoutmanager/sample.cfg!
 
 Sample configuration file::
+
+
+Developing on this project itself
+---------------------------------
+
+Developing is pretty straightforward::
+
+  $ uv sync               # Install the project
+  $ pre-commit run --all  # Syntax checks and formatting
+  $ uv run pytest         # (Or activate the virtualenv and just run pytest)