Major rework

.github/workflows/check.yml

@@ -2,7 +2,9 @@ name: check
 
 on:
   push:
+    branches: [main]
   pull_request:
+    branches: [main]
 
 jobs:
   tox:
@@ -16,7 +18,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up system
-        shell: bash
         run: |
           sudo apt-get update -qq
           sudo apt-get install git-annex

.github/workflows/docbuild.yml

@@ -1,6 +1,10 @@
 name: docs
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
 
 jobs:
   build:

.gitignore

@@ -1,13 +1,15 @@
-.pybuild/
-.coverage
-/.tox
 *.egg-info
+*.grib
 *.py[coe]
 .#*
 .*.swp
-pip-wheel-metadata
-docs/build
-docs/source/generated
+.coverage
+.hypothesis
+.pybuild/
+/.tox
+_version.py
 build/
 dist/
-*.grib
+docs/build
+docs/source/generated
+pip-wheel-metadata

MANIFEST.in

@@ -1,4 +1,4 @@
-include CONTRIBUTORS LICENSE versioneer.py
+include CONTRIBUTORS LICENSE
 graft _datalad_buildsupport
 graft src/datalad_cds
 graft tests

pyproject.toml

@@ -29,14 +29,12 @@ dependencies = [
 
 [project.optional-dependencies]
 devel = [
-  "black",
   "coverage",
-  "flake8",
-  "flake8-bugbear",
-  "isort",
+  "hypothesis",
   "mypy",
   "pytest",
   "pytest-cov",
+  "ruff",
   "sphinx",
   "sphinx_rtd_theme",
 ]
@@ -45,72 +43,33 @@ devel = [
 repository = "https://github.com/m.risse/datalad-cds"
 
 [project.scripts]
-git-annex-remote-cdsrequest = "datalad_cds.cdsrequest:main"
+git-annex-remote-cds = "datalad_cds.cds_remote:main"
 
 [project.entry-points."datalad.extensions"]
 download-cds = "datalad_cds:command_suite"
 
 [build-system]
-requires = ["setuptools >= 43.0.0", "tomli; python_version < '3.11'"]
+requires = ["setuptools>=61", "setuptools_scm>=8"]
 build-backend = "setuptools.build_meta"
 
-[tool.versioneer]
-VCS = "git"
-style = "pep440"
-versionfile_source = "src/datalad_cds/_version.py"
-versionfile_build = "datalad_cds/_version.py"
-tag_prefix = "v"
+[tool.setuptools_scm]
+version_file = "src/datalad_cds/_version.py"
 
-[tool.coverage.report]
-show_missing = true
-omit = ["src/datalad_cds/_version.py"]
-
-[tool.black]
+[tool.ruff]
 line-length = 88
-extend-exclude = '''
-(
-  ^/_datalad_buildsupport
-  | ^/versioneer.py
-  | ^/src/datalad_cds/_version.py
-)
-'''
+extend-exclude = ["_datalad_buildsupport"]
 
-[tool.isort]
-profile = "black"
-skip_gitignore = true
-extend_skip = [
-  "_datalad_buildsupport/",
-  "versioneer.py",
-  "src/datalad_cds/_version.py",
-]
+[tool.ruff.lint]
+extend-select = ["I"]
 
 [tool.mypy]
 ignore_missing_imports = true
 disallow_untyped_calls = true
 disallow_untyped_defs = true
 disallow_incomplete_defs = true
 exclude = [
-  '.tox/',
-  'build/',
-  '_datalad_buildsupport/',
-  'datalad_cds/_version.py',
-  'versioneer.py',
-]
-
-[[tool.mypy.overrides]]
-module = [
-  "setup",
-  "datalad_cds",
-]
-disallow_untyped_calls = false
-
-[[tool.mypy.overrides]]
-module = [
-  "datalad_cds._version",
-  "versioneer",
-  "_datalad_buildsupport.*",
+  ".tox/",
+  "_datalad_buildsupport/",
+  "build/",
+  "venv/",
 ]
-follow_imports = "skip"
-
-# [tool.flake8]
-# flake8 still does not support pyproject.toml, so it's configured in .flake8

src/datalad_cds/__init__.py

@@ -4,6 +4,13 @@
 
 import logging
 
+from datalad_cds._version import (  # noqa: F401
+    __version__,
+    __version_tuple__,
+    version,
+    version_tuple,
+)
+
 lgr = logging.getLogger("datalad.cds")
 
 # Defines a datalad command suite.
@@ -16,7 +23,7 @@
         # specification of a command, any number of commands can be defined
         (
             # importable module that contains the command implementation
-            "datalad_cds.downloadcds",
+            "datalad_cds.download_cds",
             # name of the command class implementation in above module
             "DownloadCDS",
             # optional name of the command in the cmdline API
@@ -26,7 +33,3 @@
         ),
     ],
 )
-
-from . import _version  # noqa: E402
-
-__version__ = _version.get_versions()["version"]