Merge branch 'splink4_dev' into maint/clean_up_deprecated_actions

.github/workflows/mypy.yml

@@ -0,0 +1,60 @@
+name: Type hinting with mypy
+on:
+  pull_request:
+    branches:
+      - master
+      - '**dev'
+    paths:
+      - splink/**
+      - tests/**
+      - pyproject.toml
+
+jobs:
+  mypy:
+    runs-on: ubuntu-20.04
+    name: Check type hinting with mypy
+    steps:
+      #----------------------------------------------
+      #       check-out repo and set-up python
+      #----------------------------------------------
+      - name: Check out repository
+        uses: actions/checkout@v3
+      - name: Set up python
+        id: setup-python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.9.10
+      #----------------------------------------------
+      #       set up environment
+      #----------------------------------------------
+      - name: Load cached Poetry installation
+        uses: actions/cache@v2
+        with:
+          path: ~/.local
+          key: poetry-0 
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.8.2
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+          installer-parallel: true
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v2
+        with:
+          path: .venv
+          key: venv-typehint-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}-00
+      - name: Install dependencies
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
+        run: poetry install --no-interaction --no-root --with=typechecking
+      - name: Install library
+        run: poetry install --no-interaction
+      #----------------------------------------------
+      #              run mypy
+      #----------------------------------------------
+      - name: Run mypy
+        run: |
+          source .venv/bin/activate
+          mypy splink
+

.github/workflows/poetry_pypi_release.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: master
+          ref: splink4_dev
       - name: Install poetry
         run: pipx install poetry
       - uses: actions/setup-python@v4
@@ -32,7 +32,3 @@ jobs:
           # feed exact file for ease
           file_pattern: 'duckdbless_requirements.txt'
           repository: ./scripts
-      - name: Update binder_branch branch so binder points to current master
-        run: |
-          git branch -f binder_branch master
-          git push origin binder_branch

.github/workflows/run_demos_examples.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+      - "**dev"
     paths:
       - "splink/**"
       - "docs/demos/examples/**"
@@ -41,7 +42,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: '1.7.0'
+          version: "1.7.0"
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true
@@ -78,4 +79,4 @@ jobs:
       - name: Test ${{ matrix.test-group }} example notebooks with pytest
         run: |
           source .venv/bin/activate
-          python -m pytest --nbmake -n=auto --nbmake-kernel=python3 --durations=0 docs/demos/examples/${{ matrix.test-group }}/*ipynb
+          python -m pytest -vv --nbmake -n=auto --nbmake-kernel=python3 --durations=0 docs/demos/examples/${{ matrix.test-group }}/*ipynb

.github/workflows/run_demos_tutorials.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+      - "**dev"
     paths:
       - splink/**
       - docs/demos/tutorials/**
@@ -40,7 +41,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: '1.7.0'
+          version: "1.7.0"
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true
@@ -78,4 +79,4 @@ jobs:
       - name: Test with pytest
         run: |
           source .venv/bin/activate
-          python -m pytest --nbmake -n=auto --nbmake-kernel=python3 docs/demos/tutorials/*ipynb
+          python -m pytest -vv --nbmake -n=auto --nbmake-kernel=python3 docs/demos/tutorials/*ipynb