Merge formatting checks with tests

Author: larose

.github/workflows/publish.yml

@@ -6,7 +6,7 @@ on:
       - master
 
 jobs:
-  build-and-check:
+  build-and-test:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
@@ -21,8 +21,8 @@ jobs:
         run: make ci.bootstrap
       - name: Update version in pyproject.toml
         run: make ci.update-version-in-pyproject
-      - name: Check
-        run: make check
+      - name: Test
+        run: make test
       - name: Upload dist directory
         uses: actions/upload-artifact@v4
         with:
@@ -31,7 +31,7 @@ jobs:
 
   publish:
     runs-on: ubuntu-22.04
-    needs: build-and-check
+    needs: build-and-test
     steps:
       - uses: actions/checkout@v4
       - name: Setup python

.github/workflows/pull_request.yml

@@ -6,7 +6,7 @@ on:
       - master
 
 jobs:
-  build-and-check:
+  build-and-test:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
@@ -19,5 +19,5 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Bootstrap
         run: make ci.bootstrap
-      - name: Check
-        run: make check
+      - name: Test
+        run: make test

Makefile

@@ -23,9 +23,6 @@ bootstrap: bootstrap.install
 bootstrap.install:
 	poetry install
 
-.PHONY: check
-check: lint test
-
 .PHONY: ci.bootstrap
 ci.bootstrap:
 	pip install poetry
@@ -62,26 +59,15 @@ format:
 	poetry run black $(SOURCE_DIRS)
 	poetry run isort $(SOURCE_DIRS)
 
-.PHONY: lint
-lint: lint.format  # lint.types
+.PHONY: test
+test: test.format test.integration test.unit
 
-.PHONY: lint.format
-lint.format:
+.PHONY: test.format
+test.format:
 	poetry run flake8 $(SOURCE_DIRS)
 	poetry run isort --check-only --diff --ignore-whitespace --quiet $(SOURCE_DIRS)
 	poetry run black --check --diff $(SOURCE_DIRS)
 
-#.PHONY: lint.types
-#lint.types:
-#	poetry run mypy $(SOURCE_DIRS)
-
-.PHONY: test
-test: test.unit test.integration
-
-.PHONY: test.unit
-test.unit:
-	poetry run pytest --verbose
-
 .PHONY: test.integration
 test.integration: clean build
 	cp dist/utt-*-py3-none-any.whl $(INTEGRATION_DIR)
@@ -90,3 +76,8 @@ test.integration: clean build
 	cat $(TEMPLATE_DOCKERFILE) >> $(GENERATED_DOCKERFILE)
 	docker build --tag $(TEST_DOCKER_IMAGE) --file $(GENERATED_DOCKERFILE) $(INTEGRATION_DIR)
 	docker run --rm $(TEST_DOCKER_IMAGE) $(INTEGRATION_CMD)
+
+.PHONY: test.unit
+test.unit:
+	poetry run pytest --verbose
+

docs/DEVELOPMENT.md

@@ -5,11 +5,10 @@
 - [System dependencies](#system-dependencies)
 - [Python dependencies](#python-dependencies)
 - [Formatting code](#formatting-code)
-- [Code quality](#code-quality)
 - [Executing `utt` from source](#executing-utt-from-source)
 - [Tests](#tests)
     - [Unit tests](#unit-tests)
-        - [Integration Tests](#integration-tests)
+    - [Integration Tests](#integration-tests)
 
 
 
@@ -39,18 +38,6 @@ format the code with this command:
 `$ make format`
 
 
-## Code quality
-
-We run a few checks to enforce a minimum code quality. You can run
-them with this command:
-
-`$ make lint`
-
-It checks that the code is properly formatted (it shouldn't be an
-issue if you ran `make format`) and a few other checks such as unused
-imports, unused variables, etc.
-
-
 ## Executing `utt` from source
 
 To run utt from local source:
@@ -62,9 +49,7 @@ To run utt from local source:
 
 This section is very important as most code changes need tests.
 
-There are two kinds of tests: unit and integration tests.
-
-You can run both with this command:
+You can run all tests (including format checks, unit tests, and integration tests) with this command:
 
 `$ make test`
 

poetry.lock

@@ -31,6 +31,5 @@ black = "^23.12.1"
 ddt = "^1.7.1"
 flake8 = "^7.0.0"
 isort = "^5.13.2"
-mypy = "^1.8.0"
 pytest = "^7.4.4"
 requests = "^2.31.0"