feat: migrate from pylint/black to ruff (#42)
This commit is contained in:
parent
05ada48be5
commit
13da199f04
@ -17,5 +17,5 @@ class MetaDataHook(MetadataHookInterface):
|
|||||||
def load_about() -> dict[str, str]:
|
def load_about() -> dict[str, str]:
|
||||||
about: dict[str, str] = {}
|
about: dict[str, str] = {}
|
||||||
with open(os.path.join(HERE, "tutorxqueue", "__about__.py"), "rt", encoding="utf-8") as f:
|
with open(os.path.join(HERE, "tutorxqueue", "__about__.py"), "rt", encoding="utf-8") as f:
|
||||||
exec(f.read(), about) # pylint: disable=exec-used
|
exec(f.read(), about)
|
||||||
return about
|
return about
|
||||||
|
|||||||
24
Makefile
24
Makefile
@ -1,25 +1,30 @@
|
|||||||
.DEFAULT_GOAL := help
|
.DEFAULT_GOAL := help
|
||||||
.PHONY: docs
|
.PHONY: docs
|
||||||
SRC_DIRS = ./tutorxqueue
|
SRC_DIRS = ./tutorxqueue
|
||||||
BLACK_OPTS = --exclude templates ${SRC_DIRS}
|
|
||||||
|
|
||||||
# Warning: These checks are not necessarily run on every PR.
|
# Warning: These checks are not necessarily run on every PR.
|
||||||
test: test-lint test-types test-format # Run some static checks.
|
test: test-lint test-format test-types test-pythonpackage # Run some static checks.
|
||||||
|
|
||||||
test-format: ## Run code formatting tests
|
test-format: ## Run code formatting tests
|
||||||
black --check --diff $(BLACK_OPTS)
|
ruff format --check --diff $(SRC_DIRS)
|
||||||
|
|
||||||
test-lint: ## Run code linting tests
|
test-lint: ## Run code linting tests
|
||||||
pylint --errors-only --enable=unused-import,unused-argument --ignore=templates --ignore=docs/_ext ${SRC_DIRS}
|
ruff check ${SRC_DIRS}
|
||||||
|
|
||||||
test-types: ## Run type checks.
|
test-types: ## Run type checks.
|
||||||
mypy --exclude=templates --ignore-missing-imports --implicit-reexport --strict ${SRC_DIRS}
|
mypy --exclude=templates --ignore-missing-imports --implicit-reexport --strict ${SRC_DIRS}
|
||||||
|
|
||||||
format: ## Format code automatically
|
build-pythonpackage: ## Build the "tutor-xqueue" python package for upload to pypi
|
||||||
black $(BLACK_OPTS)
|
python -m build --sdist
|
||||||
|
|
||||||
isort: ## Sort imports. This target is not mandatory because the output may be incompatible with black formatting. Provided for convenience purposes.
|
test-pythonpackage: build-pythonpackage ## Test that package can be uploaded to pypi
|
||||||
isort --skip=templates ${SRC_DIRS}
|
twine check dist/tutor_xqueue-$(shell make version).tar.gz
|
||||||
|
|
||||||
|
format: ## Format code automatically
|
||||||
|
ruff format ${SRC_DIRS}
|
||||||
|
|
||||||
|
fix-lint: ## Fix lint errors automatically
|
||||||
|
ruff check --fix ${SRC_DIRS}
|
||||||
|
|
||||||
changelog-entry: ## Create a new changelog entry.
|
changelog-entry: ## Create a new changelog entry.
|
||||||
scriv create
|
scriv create
|
||||||
@ -27,6 +32,9 @@ changelog-entry: ## Create a new changelog entry.
|
|||||||
changelog: ## Collect changelog entries in the CHANGELOG.md file.
|
changelog: ## Collect changelog entries in the CHANGELOG.md file.
|
||||||
scriv collect
|
scriv collect
|
||||||
|
|
||||||
|
version: ## Print the current tutor-xqueue version
|
||||||
|
@python -c 'import io, os; about = {}; exec(io.open(os.path.join("tutorxqueue", "__about__.py"), "rt", encoding="utf-8").read(), about); print(about["__version__"])'
|
||||||
|
|
||||||
ESCAPE =
|
ESCAPE =
|
||||||
help: ## Print this help
|
help: ## Print this help
|
||||||
@grep -E '^([a-zA-Z_-]+:.*?## .*|######* .+)$$' Makefile \
|
@grep -E '^([a-zA-Z_-]+:.*?## .*|######* .+)$$' Makefile \
|
||||||
|
|||||||
@ -0,0 +1,2 @@
|
|||||||
|
- [Improvement] Migrate from pylint and black to ruff. (by @rehmansheikh222)
|
||||||
|
- [Improvement] Test python package distribution build when running make test. (by @rehmansheikh222)
|
||||||
@ -36,8 +36,7 @@ dynamic = ["version"]
|
|||||||
[project.optional-dependencies]
|
[project.optional-dependencies]
|
||||||
dev = [
|
dev = [
|
||||||
"tutor[dev]>=20.0.0,<21.0.0",
|
"tutor[dev]>=20.0.0,<21.0.0",
|
||||||
"black",
|
"ruff"
|
||||||
"pylint"
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# https://packaging.python.org/en/latest/specifications/well-known-project-urls/#well-known-labels
|
# https://packaging.python.org/en/latest/specifications/well-known-project-urls/#well-known-labels
|
||||||
@ -68,3 +67,19 @@ exclude = ["tests*"]
|
|||||||
|
|
||||||
[project.entry-points."tutor.plugin.v1"]
|
[project.entry-points."tutor.plugin.v1"]
|
||||||
xqueue = "tutorxqueue.plugin"
|
xqueue = "tutorxqueue.plugin"
|
||||||
|
|
||||||
|
[tool.ruff]
|
||||||
|
exclude = ["templates", "docs/_ext"]
|
||||||
|
|
||||||
|
[tool.ruff.lint]
|
||||||
|
# E: pycodestyle errors
|
||||||
|
# I: isort
|
||||||
|
# N: pep8-naming
|
||||||
|
select = ["E", "I", "N"]
|
||||||
|
|
||||||
|
# F401: unused-import
|
||||||
|
# F841: unused-variable
|
||||||
|
# W292: missing-newline-at-end-of-file
|
||||||
|
extend-select = ["F401", "F841", "W292"]
|
||||||
|
|
||||||
|
[tool.ruff.format]
|
||||||
|
|||||||
@ -23,7 +23,7 @@ config: dict[str, dict[str, Any]] = {
|
|||||||
"defaults": {
|
"defaults": {
|
||||||
"VERSION": __version__,
|
"VERSION": __version__,
|
||||||
"AUTH_USERNAME": "lms",
|
"AUTH_USERNAME": "lms",
|
||||||
"DOCKER_IMAGE": "{{ DOCKER_REGISTRY }}overhangio/openedx-xqueue:{{ XQUEUE_VERSION }}",
|
"DOCKER_IMAGE": "{{ DOCKER_REGISTRY }}overhangio/openedx-xqueue:{{ XQUEUE_VERSION }}", # noqa: E501
|
||||||
"HOST": "xqueue.{{ LMS_HOST }}",
|
"HOST": "xqueue.{{ LMS_HOST }}",
|
||||||
"MYSQL_DATABASE": "xqueue",
|
"MYSQL_DATABASE": "xqueue",
|
||||||
"MYSQL_USERNAME": "xqueue",
|
"MYSQL_USERNAME": "xqueue",
|
||||||
@ -200,7 +200,7 @@ class Client:
|
|||||||
message = response.get("content")
|
message = response.get("content")
|
||||||
if message != "Logged in":
|
if message != "Logged in":
|
||||||
raise exceptions.TutorError(
|
raise exceptions.TutorError(
|
||||||
f"Could not login to xqueue server at {self.base_url}. Response: '{message}'"
|
f"Could not login to xqueue server at {self.base_url}. Response: '{message}'" # noqa: E501
|
||||||
)
|
)
|
||||||
|
|
||||||
def show_submission(self, queue: str) -> Union[dict[str, Any], Any]:
|
def show_submission(self, queue: str) -> Union[dict[str, Any], Any]:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user