Update pre-commit checks

Author: siiptuo

.github/workflows/tests.yml

@@ -4,7 +4,6 @@ on: [push, pull_request]
 
 jobs:
   build:
-
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
@@ -20,11 +19,8 @@ jobs:
           cache: pip
       - name: Install dependencies
         run: pip install .[dev]
-      - name: Check types
-        run: mypy src/
-      - name: Style flake8
-        run: flake8 src/
-      - name: Style pylint
-        run: pylint src/
+      - name: Run pre-commit checks
+        if: startsWith(matrix.os, 'ubuntu-')
+        run: pre-commit run --all-files --show-diff-on-failure
       - name: Run tests
         run: pytest --cov=cloudnet_submit

.pre-commit-config.yaml

@@ -1,56 +1,39 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
-      - id: detect-private-key
-      - id: trailing-whitespace
-      - id: end-of-file-fixer
-      - id: check-yaml
-      - id: check-toml
-      - id: debug-statements
-      - id: check-added-large-files
       - id: check-case-conflict
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
       - id: check-shebang-scripts-are-executable
+      - id: end-of-file-fixer
       - id: fix-byte-order-marker
       - id: mixed-line-ending
         args: ["--fix", "lf"]
-
-  - repo: https://github.com/psf/black
-    rev: 23.1.0
-    hooks:
-      - id: black
-
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        args: ["--profile", "black", "--filter-files"]
-
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
-    hooks:
-    -   id: flake8
-
-  - repo: local
+      - id: trailing-whitespace
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.11.6
     hooks:
-      - id: pylint
-        name: pylint
-        entry: pylint
-        language: system
-        types: [python]
-        args:
-          [
-            "-rn", # Only display messages
-            "-sn", # Don't display the score
-          ]
-
+      - id: ruff
+        args: ["--fix"]
+      - id: ruff-format
   - repo: local
     hooks:
       - id: mypy
         name: mypy
         entry: mypy
         language: system
         types: [python]
-        exclude: ^(tests/|release|setup.py)
+        require_serial: true
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v3.1.0
+    hooks:
+      - id: prettier
+  - repo: https://github.com/pappasam/toml-sort
+    rev: v0.24.2
+    hooks:
+      - id: toml-sort-fix
+  - repo: https://github.com/crate-ci/typos
+    rev: v1.31.1
+    hooks:
+      - id: typos

CHANGELOG.md

@@ -7,18 +7,22 @@
 ## 0.0.8 – 2023-11-07
 
 ### Added
+
 - Add `peridiocity` to instrument configuration
 - Print summary of the submitted files
 
 ### Changed
+
 - Validate `path_fmt` in instrument and model configuration
 
 ## 0.0.7 – 2023-10-20
 
 ### Fixed
+
 - Get current date in UTC
 
 ## 0.0.6 – 2023-08-28
 
 ### Added
+
 - Links to instrument list

README.md

@@ -1,19 +1,23 @@
 # Cloudnet data submission tool
+
 ![Tests](https://github.com/actris-cloudnet/cloudnet-submit/actions/workflows/tests.yml/badge.svg)
 [![PyPI version](https://badge.fury.io/py/cloudnet-submit.svg)](https://badge.fury.io/py/cloudnet-submit)
 
 ## Installation
 
 ### Linux/macOS
+
 If you have `python` and `pip` installed (`python >= 3.8`),
 run the command:
+
 ```sh
 pip install cloudnet-submit
 ```
 
 After that, you can use `cloudnet-submit` command to run the program.
 
 ### Windows
+
 If you are using Windows Subsystem for Linux,
 then the aforementioned Linux installation should work.
 
@@ -26,11 +30,13 @@ pip install cloudnet-submit
 ```
 
 Test if the `cloudnet-submit` command works:
+
 ```sh
 cloudnet-submit --version
 ```
 
 If not, you can use an alternative way to run the program:
+
 ```sh
 python -m cloudnet_submit --version
 ```
@@ -40,6 +46,7 @@ python -m cloudnet_submit --version
 ### Configuration file
 
 Generate a configuration file:
+
 ```sh
 cloudnet-submit --generate-config
 ```
@@ -62,7 +69,6 @@ If your instrument does not have PID yet,
 please [fill the form](https://docs.google.com/forms/d/e/1FAIpQLSeY4nvAah-K5xPfF-VMhDbmmY9lq7BbtTDKTT9BZMqT7tC7zA/viewform)
 first.
 
-
 ```toml
 # cloudnet-config.toml
 [user_account]
@@ -115,18 +121,19 @@ for a given measurement date.
 
 Use the following format codes:
 
-| Directive | Meaning                            | Example                    |
-|-----------|------------------------------------|:--------------------------:|
+| Directive | Meaning                            |          Example           |
+| --------- | ---------------------------------- | :------------------------: |
 | `%Y`      | Year with century                  | 0001, ..., 2023, ..., 9999 |
-| `%y`      | Year without century (zero-padded) | 00, ..., 23, ..., 99       |
-| `%m`      | Month (zero-padded)                | 01, 02, ..., 12            |
-| `%d`      | Day (zero-padded)                  | 01, 02, ..., 31            |
+| `%y`      | Year without century (zero-padded) |    00, ..., 23, ..., 99    |
+| `%m`      | Month (zero-padded)                |      01, 02, ..., 12       |
+| `%d`      | Day (zero-padded)                  |      01, 02, ..., 31       |
 
 You can also use wildcard character `*` in `path_fmt` field.
 
 By default, `cloudnet-submit` expects the `cloudnet-config.toml` file to be
 in your working directory.
 You can also use `--config` to specify another location for the config file:
+
 ```sh
 cloudnet-submit --config /path/to/your/config.toml
 ```
@@ -148,26 +155,31 @@ of the month, the file will be resubmitted and replaces the previously submitted
 By default, `cloudnet-submit` submits data from the past three days.
 
 Use `--dry-run` to list files that would be submitted:
+
 ```sh
 cloudnet-submit --dry-run
 ```
 
 Submit data to the Cloudnet data portal:
+
 ```sh
 cloudnet-submit
 ```
 
 You can also set the number of days to be submitted (including today):
+
 ```sh
 cloudnet-submit --last-ndays 5
 ```
 
 You can also specify a date you want to submit:
+
 ```sh
 cloudnet-submit --date 2022-06-21
 ```
 
 Or a list of dates:
+
 ```sh
 cloudnet-submit --date 2022-06-21 2022-05-01
 ```
@@ -179,10 +191,12 @@ cloudnet-submit --from-date 2022-05-01 --to-date 2022-06-24
 ```
 
 See all the options:
+
 ```sh
 cloudnet-submit --help
 ```
 
 ## Feedback and contact
+
 - Bugs, feature requests, documentation: [Create an issue](https://github.com/actris-cloudnet/cloudnet-submit/issues/new/choose) on Github
 - Or just [send us mail](mailto:actris-cloudnet@fmi.fi) :)

pyproject.toml

@@ -5,70 +5,54 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "cloudnet-submit"
 authors = [
-  { name="Niko Leskinen", email="niko.leskinen@fmi.fi" },
+  {name = "Niko Leskinen", email = "niko.leskinen@fmi.fi"},
 ]
 description = "Cloudnet data submission tool"
 dynamic = ["version"]
 requires-python = ">=3.8"
 readme = "README.md"
-license = { file="LICENSE" }
+license = {file = "LICENSE"}
 classifiers = [
-    "Development Status :: 4 - Beta",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "License :: OSI Approved :: MIT License",
-    "Intended Audience :: Science/Research",
-    "Operating System :: OS Independent",
+  "Development Status :: 4 - Beta",
+  "Intended Audience :: Science/Research",
+  "License :: OSI Approved :: MIT License",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
 ]
-
 dependencies = [
+  "braceexpand",
   "requests >= 2.28.1",
   "toml >= 0.10.2",
-  "braceexpand",
 ]
 
-[project.urls]
-Homepage = "https://github.com/actris-cloudnet/cloudnet-submit"
-Repository = "https://github.com/actris-cloudnet/cloudnet-submit"
-Changelog = "https://github.com/actris-cloudnet/cloudnet-submit/blob/main/CHANGELOG.md"
-"Bug Tracker" = "https://github.com/actris-cloudnet/cloudnet-submit/issues"
-
 [project.optional-dependencies]
 dev = [
   "mypy",
+  "pre-commit",
   "pytest",
   "pytest-cov",
-  "black",
-  "flake8",
-  "pylint",
-  "autoflake",
-  "isort",
-  "pre-commit",
   "types-requests",
+  "types-setuptools",
   "types-toml",
 ]
 # Not supported on Python <= 3.10
 release = [
-  "release-version"
+  "release-version",
 ]
+
 [project.scripts]
 cloudnet-submit = "cloudnet_submit.main:main"
 
-[tool.setuptools.packages.find]
-where = ["src"]
-[tool.setuptools.dynamic]
-version = {attr = "cloudnet_submit.version.__version__"}
-
-
-[tool.pytest.ini_options]
-addopts = "--cov=cloudnet_submit --cov-report html"
-testpaths = [
-    "tests",
-]
+[project.urls]
+Homepage = "https://github.com/actris-cloudnet/cloudnet-submit"
+Repository = "https://github.com/actris-cloudnet/cloudnet-submit"
+Changelog = "https://github.com/actris-cloudnet/cloudnet-submit/blob/main/CHANGELOG.md"
+"Bug Tracker" = "https://github.com/actris-cloudnet/cloudnet-submit/issues"
 
 [tool.mypy]
 check_untyped_defs = true
@@ -79,29 +63,33 @@ show_error_codes = true
 warn_return_any = true
 warn_unused_ignores = true
 
-[tool.black]
-line-length = 88
-target-version = ['py38']
-preview = true
-
-[tool.isort]
-profile= "black"
-line_length = 88
-
-[tool.pylint]
-ignore-patterns = "test_.*\\.py,release"
-ignore-paths = "^tests/.*"
-good-names = ["i", "j", "k", "f",]
-max-line-length = 88
-disable = [
-  "missing-module-docstring",
-  "missing-class-docstring",
-  "missing-function-docstring",
-  "too-few-public-methods",
-  "too-many-arguments"
+[tool.pytest.ini_options]
+addopts = "--cov=cloudnet_submit --cov-report html"
+testpaths = [
+  "tests",
 ]
 
 [tool.release-version]
 filename = "src/cloudnet_submit/version.py"
 pattern = "__version__ = \"(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)\""
 changelog = "CHANGELOG.md"
+
+[tool.ruff.lint]
+select = ["B", "D", "E", "F", "I", "PLC", "PLE", "PLW", "SIM"]
+ignore = ["D1"]
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["PLC0414"]
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
+[tool.setuptools.dynamic]
+version = {attr = "cloudnet_submit.version.__version__"}
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.tomlsort]
+trailing_comma_inline_array = true
+sort_inline_arrays = true

src/cloudnet_submit/__init__.py

@@ -1 +1 @@
-from cloudnet_submit.version import __version__
+from cloudnet_submit.version import __version__ as __version__