tweak workflows

.github/workflows/lint.yml

@@ -17,17 +17,28 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'collerek/ormar'
     steps:
     - uses: actions/checkout@v3
+
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
         python-version: 3.11
-    - name: Install dependencies
+
+    - name: Install Poetry
+      uses: snok/[email protected]
+      with:
+        version: 1.4.2
+        virtualenvs-create: false
+
+    - name: Poetry details
       run: |
-        python -m pip install poetry==1.4.2
-        poetry install --extras "all"
-      env:
-        POETRY_VIRTUALENVS_CREATE: false
+        poetry --version
+        poetry config --list
+
+    - name: Install dependencies
+      run: poetry install --extras "all" --no-root
+
     - name: Format
-      run: python -m black .
+      run: make fmt
+
     - name: Lint
-      run: python -m ruff . --fix
+      run: make lint

.github/workflows/test-package.yml

@@ -42,31 +42,48 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-    - uses: actions/checkout@v3
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        submodules: false
+
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
+
+    - name: Install Poetry
+      uses: snok/[email protected]
+      with:
+        version: 1.4.2
+        virtualenvs-create: false
+
+    - name: Poetry details
       run: |
-        python -m pip install poetry==1.4.2
-        poetry install --extras "all"
-      env:
-        POETRY_VIRTUALENVS_CREATE: false
+        poetry --version
+        poetry config --list
+
+    - name: Install dependencies
+      run: poetry install --extras "all" --no-root
+
     - name: Run mysql
       env:
         DATABASE_URL: "mysql://username:[email protected]:3306/testsuite"
       run: bash scripts/test.sh
+
     - name: Run postgres
       env:
         DATABASE_URL: "postgresql://username:password@localhost:5432/testsuite"
       run: bash scripts/test.sh
+
     - name: Run sqlite
       env:
         DATABASE_URL: "sqlite:///testsuite"
       run: bash scripts/test.sh
+
     - name: Upload coverage
       uses: codecov/[email protected]
+
     - name: Test & publish code coverage
       uses: paambaati/[email protected]
       if: github.event.pull_request.head.repo.full_name == 'collerek/ormar'

.github/workflows/type-check.yml

@@ -17,15 +17,25 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'collerek/ormar'
     steps:
     - uses: actions/checkout@v3
+
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
         python-version: 3.11
-    - name: Install dependencies
+
+    - name: Install Poetry
+      uses: snok/[email protected]
+      with:
+        version: 1.4.2
+        virtualenvs-create: false
+
+    - name: Poetry details
       run: |
-        python -m pip install poetry==1.4.2
-        poetry install --extras "all"
-      env:
-        POETRY_VIRTUALENVS_CREATE: false
+        poetry --version
+        poetry config --list
+
+    - name: Install dependencies
+      run: poetry install --extras "all" --no-root
+
     - name: Type check
-      run: python -m mypy ormar tests --ignore-missing-imports --install-types --non-interactive
+      run: make type_check