Merge pull request #11 from robertknight/refactor-datasets

Refactor `ocrs_models.datasets`
robertknight · Feb 10, 2024 · 936d2af · 936d2af
2 parents e2b30fe + 24c5d10
commit 936d2af
Show file tree

Hide file tree

Showing 19 changed files with 1,244 additions and 1,178 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,6 @@ jobs:
         run: |
           poetry install
           poetry run pip install torch torchvision
-      - name: Check formatting and types
+      - name: Lint, format and typecheck
         run: |
-          poetry run black --check .
-          poetry run mypy ocrs_models
+          make qa
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 # Model checkpoints
 *.pt
 
-datasets/
-wandb/
+__pycache__/
+
+/datasets
+/wandb
diff --git a/Makefile b/Makefile
@@ -1,3 +1,18 @@
-qa:
+.PHONY: qa
+qa: checkformat lint typecheck
+
+.PHONY: checkformat
+checkformat:
 	poetry run black --check .
+
+.PHONY: format
+format:
+	poetry run black ocrs_models
+
+.PHONY: lint
+lint:
+	poetry run ruff ocrs_models
+
+.PHONY: typecheck
+typecheck:
 	poetry run mypy ocrs_models