Overhaul tooling

Author: RadekManak

.pylintrc

@@ -1,20 +1,22 @@
-FROM registry.access.redhat.com/ubi9/python-311
+FROM registry.access.redhat.com/ubi9/python-312
 
 USER root
 
-ENV GO_VERSION=1.22.8
-RUN curl -Ls https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz | \
-    tar -C /usr/local -zxvf - go/
+ENV GO_VERSION=1.24.3
 ENV PATH="/usr/local/go/bin:$PATH"
 
+RUN dnf install -y tar gzip git make && \
+    curl -Ls https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz | \
+    tar -C /usr/local -zxvf - go/
+
 WORKDIR /src
 COPY . .
 RUN python -m pip install .
 
 WORKDIR /working
 RUN rm -rf /src
-RUN chown default .
+RUN chown 1001:0 .
 RUN chmod 0777 .
 
-USER default
+USER 1001
 ENTRYPOINT [ "/opt/app-root/bin/rebasebot" ]

Containerfile

@@ -1,23 +1,38 @@
-PYTHON=python3
-
-.PHONY: deps
-deps:
-	$(PYTHON) -m pip install --upgrade pip
-	$(PYTHON) -m pip install --upgrade -r requirements-hacking.txt
+SRC_DIRS = rebasebot tests
 
 .PHONY: unittests
-unittests:
+unittests: ## Run unit & integration tests
 	hack/tests.sh
 
 .PHONY: lint
-lint:
-	$(PYTHON) -m flake8 --max-line-length=120 rebasebot tests
-	$(PYTHON) -m pylint rebasebot tests
-	$(PYTHON) -m mypy rebasebot tests --no-strict-optional --ignore-missing-imports
+lint: ## Run lint and format in check mode
+	uv tool run ruff check $(SRC_DIRS)
+	uv tool run ruff format --check $(SRC_DIRS)
+
+.PHONY: lint-fix
+lint-fix: ## Fix fixable lint issues and format code
+	uv tool run ruff format $(SRC_DIRS)
+	uv tool run ruff check --fix $(SRC_DIRS)
 
 .PHONY: venv
-venv:
-	$(PYTHON) -m venv env
+venv: ## Create venv
+	uv venv
+
+.PHONY: install
+install: ## Install into your user python environment.
+	python -m pip install --user .
+
+.PHONY: build
+build: ## Create build tarball
+	uv build
+
+.PHONY: help
+help: ## Display this help screen
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
+
+.PHONY: clean
+clean:
+	rm -r dist/ build/ .pytest_cache/ .mypy_cache rebasebot.egg-info .coverage
 
-install:
-	$(PYTHON) -m pip install --user .
+# old target still referenced in ci
+.PHONY: deps

Makefile

@@ -37,4 +37,4 @@ if [ "$OPENSHIFT_CI" == "true" ] && [ -n "$ARTIFACT_DIR" ] && [ -d "$ARTIFACT_DI
 fi
 
 set -x
-pytest $PYTEST_ARGS "$REPO_ROOT"
+uv run pytest $PYTEST_ARGS "$REPO_ROOT"

hack/configure-hooks.sh

@@ -0,0 +1,6 @@
+def main():
+    print("Hello from rebasebot!")
+
+
+if __name__ == "__main__":
+    main()

hack/lint

@@ -1,6 +1,72 @@
 [build-system]
-requires = [
-    "setuptools>=42",
-    "wheel"
-]
+requires = ["setuptools>=42", "wheel"]
 build-backend = "setuptools.build_meta"
+
+[project]
+name = "rebasebot"
+version = "0.0.1"
+description = "A tool to sync downstream repositories with their upstream"
+readme = "README.md"
+requires-python = ">=3.11"
+
+dependencies = [
+    "github3-py>=4.0.1",
+    "gitpython>=3.1.44",
+]
+
+[dependency-groups]
+dev = [
+    "pytest>=8.3.5",
+    "pytest-cov>=6.1.1",
+]
+
+[project.scripts]
+rebasebot = "rebasebot.cli:main"
+
+[tool.setuptools.packages.find]
+where = ["."]
+
+[tool.setuptools.package-data]
+rebasebot = ["builtin-hooks/**"]
+
+[tool.ruff]
+line-length = 120
+
+[tool.ruff.lint]
+ignore = [
+    "PLR0912", # too many branches
+    "PLR0913", # too many arguments
+    "PLR0915", # too many statements
+    "PLR0911", # too many return statements
+    # Enabling these rules would require significant refactoring
+]
+
+select = [
+    "E",   # pycodestyle errors
+    "W",   # pycodestyle warnings
+    "F",   # pyflakes - undefined names, unused imports
+    "I",   # isort - import sorting
+    "B",   # flake8-bugbear - common bugs and design problems
+    "C4",  # flake8-comprehensions - better list/set/dict comprehensions
+    "UP",  # pyupgrade - upgrade syntax for newer Python versions
+    "PL",  # pylint - static analysis rules
+    #"D",   # pydocstyle - docstring conventions
+    #"N",   # pep8-naming - naming conventions
+    #"RET", # flake8-return - return statement patterns
+    #"SIM", # flake8-simplify - code simplification
+    #"PTH", # flake8-use-pathlib - prefer pathlib over os.path
+    # TODO Enable the currently disabled rules
+]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/**/*.py" = ["PLR2004", "D"]  # allow magic values, disable docstring checks in tests
+
+[tool.ruff.lint.pep8-naming]
+ignore-names = ["i", "j", "k", "ex", "Run", "_"]  # allow common single-letter variable names
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+
+[tool.ruff.lint.isort]
+known-first-party = ["rebasebot"]  # treat rebasebot as first-party for import sorting