Merge pull request #35 from hugovk/rm-setup

Modernise packaging

.github/workflows/test.yml

@@ -22,18 +22,16 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip
-          cache-dependency-path: "setup.cfg"
 
       - name: Install dependencies
         run: |
           python -m pip install -U pip
           python -m pip install -U wheel
-          python -m pip install .
+          python -m pip install -U tox
 
-      - name: Test run
+      - name: Tox tests
         run: |
-          stravavis --help
-          stravavis tests/gpx --activities_path tests/csv
+          tox -e py
 
       - name: Upload output images
         uses: actions/upload-artifact@v3

.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.4.0
+    rev: v3.9.0
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black
 
@@ -39,8 +39,23 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
 
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: 0.13.0
+    hooks:
+      - id: pyproject-fmt
+
+  - repo: https://github.com/abravalheri/validate-pyproject
+    rev: v0.13
+    hooks:
+      - id: validate-pyproject
+
+  - repo: https://github.com/tox-dev/tox-ini-fmt
+    rev: 1.3.1
+    hooks:
+      - id: tox-ini-fmt
+
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.9-for-vscode
+    rev: v3.0.0
     hooks:
       - id: prettier
         args: [--prose-wrap=always, --print-width=88]

RELEASING.md

@@ -2,8 +2,6 @@
 
 - [ ] Get `main` to the appropriate code release state.
 
-- [ ] Update `version` in `setup.cfg` and commit and push.
-
 * [ ] Start from a freshly cloned repo:
 
 ```bash

pyproject.toml

@@ -1,2 +1,62 @@
+[build-system]
+build-backend = "hatchling.build"
+requires = [
+  "hatch-vcs",
+  "hatchling",
+]
+
+[project]
+name = "stravavis"
+description = "Create artistic visualisations with your exercise data"
+readme = "README.md"
+keywords = [
+  "artistic",
+  "artistic visualisations",
+  "exercise",
+  "exercise data",
+  "strava",
+  "visualisation",
+]
+license = {text = "MIT"}
+maintainers = [{name = "Hugo van Kemenade"}]
+authors = [{name = "Marcus Volz"}]
+requires-python = ">=3.8"
+classifiers = [
+  "Development Status :: 3 - Alpha",
+  "License :: OSI Approved :: MIT License",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Topic :: Artistic Software",
+  "Topic :: Multimedia :: Graphics",
+  "Topic :: Scientific/Engineering :: Visualization",
+]
+dynamic = [
+  "version",
+]
+dependencies = [
+  "calmap",
+  "fit2gpx",
+  "gpxpy",
+  "matplotlib",
+  "pandas<2", # Pending https://github.com/MarvinT/calmap/pull/14
+  "plotnine",
+  "rich",
+  "seaborn",
+]
+[project.urls]
+Homepage = "https://github.com/marcusvolz/strava_py"
+Source = "https://github.com/marcusvolz/strava_py"
+[project.scripts]
+stravavis = "stravavis.cli:main"
+
+[tool.hatch]
+version.source = "vcs"
+
+[tool.hatch.version.raw-options]
+local_scheme = "no-local-version"
+
 [tool.isort]
 profile = "black"

tox.ini

@@ -0,0 +1,22 @@
+[tox]
+requires =
+    tox>=4.2
+env_list =
+    lint
+    py{311, 310, 39, 38}
+
+[testenv]
+pass_env =
+    FORCE_COLOR
+commands =
+    stravavis --help
+    stravavis tests/gpx --activities_path tests/csv
+
+[testenv:lint]
+skip_install = true
+deps =
+    pre-commit
+pass_env =
+    PRE_COMMIT_COLOR
+commands =
+    pre-commit run --all-files --show-diff-on-failure