dev: upgrade to new dev setup

Author: delfick

.github/workflows/ci.yml

@@ -10,12 +10,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest] # TODO: make this pass on github hosted windows: , windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
         python-version: [3.7, 3.8, 3.9, "3.10"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -24,10 +24,18 @@ jobs:
 
       - name: Install deps
         shell: bash
+        env:
+          VENVSTARTER_ONLY_MAKE_VENV: "1"
         run: |
-          set -e
-          python -m pip install --user --upgrade pip
-          python -m pip install -e ".[tests]"
+          if [ "$RUNNER_OS" == "Windows" ]; then
+            if ! python -c 'import sys; sys.exit(1) if sys.version_info < (3, 9) else None'; then
+              # Need for python 3.7 and 3.8 on windows
+              python -m venv tools/.python
+              ./tools/.python/Scripts/python -m pip install setuptools pip -U
+            fi
+          fi
+
+          python ./tools/venv
 
       - name: Run tests
         shell: bash

.github/workflows/lint.yml

@@ -8,33 +8,37 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
-      - run: python -m pip install pip venvstarter -U
-
-      - run: ./tools/pylama --help
+      - name: Install deps
+        shell: bash
+        env:
+          VENVSTARTER_ONLY_MAKE_VENV: "1"
+        run: python ./tools/venv
 
       - name: Ensure linter is happy
         run: ./lint
 
   format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
-
-      - run: python -m pip install pip venvstarter -U
+          python-version: "3.10"
 
-      - run: ./tools/black
+      - name: Install deps
+        shell: bash
+        env:
+          VENVSTARTER_ONLY_MAKE_VENV: "1"
+        run: python ./tools/venv
 
       - name: Ensure code is formatted
         run: |

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Stephen Moore
+Copyright (c) 2023 Stephen Moore
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

find

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Helper for searching code base without searching through external code
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+(
+    cd $DIR
+    exec ack "$@" \
+        --ignore-directory .tox \
+        --ignore-directory .mypy_cache \
+        --ignore-directory dist \
+        --ignore-directory build \
+        --ignore-directory alt_pytest_asyncio.egg-info \
+        --ignore-directory tools \
+)

format

@@ -4,5 +4,4 @@ set -e
 
 cd "$(git rev-parse --show-toplevel)"
 
-./tools/black black alt_pytest_asyncio
-./tools/black noy_black $(find tests -name '*.py')
+./tools/venv format "$@"

lint

@@ -2,6 +2,6 @@
 
 set -e
 
-cd $(git rev-parse --show-toplevel)
+cd "$(git rev-parse --show-toplevel)"
 
-./tools/pylama alt_pytest_asyncio tests "$@"
+exec ./tools/venv lint "$@"

pylama.ini

@@ -1,8 +1,6 @@
 [pylama]
-skip = */setup.py
-
-[pylama:tests/*]
-ignore = E225,E202,E211,E231,E226,W292,W291,E251,E122,E501,E701,E227,E305,E128,W391,C901
+skip = setup.py,tools/.python/**
+ignore = E225,E202,E211,E231,E226,W292,W291,E251,E122,E501,E701,E227,E305,E128,W391
 
 [pylama:pyflakes]
 builtins = _

pyproject.toml

@@ -6,7 +6,15 @@ exclude = '''
      \.git
    | \.tox
    | dist
-   | tools
-   | docs
+   | tools/\.python
 )/
 '''
+
+[tool.isort]
+profile = "black"
+skip_glob = [
+   ".git/*",
+   ".tox/*",
+   "dist/*",
+   "tools/.*",
+]

run.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+cwd="$(pwd)"
+
+# Bash does not make it easy to find where this file is
+# Here I'm making it so it doesn't matter what directory you are in
+# when you execute this script. And it doesn't matter whether you're
+# executing a symlink to this script
+# Note the `-h` in the while loop asks if this path is a symlink
+pushd . >'/dev/null'
+SCRIPT_PATH="${BASH_SOURCE[0]:-$0}"
+while [ -h "$SCRIPT_PATH" ]; do
+    cd "$(dirname -- "$SCRIPT_PATH")"
+    SCRIPT_PATH="$(readlink -f -- "$SCRIPT_PATH")"
+done
+cd "$(dirname -- "$SCRIPT_PATH")" >'/dev/null'
+
+# We use noseOfYeti here, so let's make black compatible with it
+export NOSE_OF_YETI_BLACK_COMPAT=true
+export NOSE_OF_YETI_IT_RETURN_TYPE=false
+export MYPYPATH=$(pwd)/modules/tests/stubs:$MYPYPATH
+
+HANDLED=0
+
+# Special case activate to make the virtualenv active in this session
+if [[ "$0" != "$BASH_SOURCE" ]]; then
+    HANDLED=1
+    if [[ "activate" == "$1" ]]; then
+        VENVSTARTER_ONLY_MAKE_VENV=1 ./tools/venv
+        source ./tools/.python/bin/activate
+        cd "$cwd"
+    else
+        echo "only say \`source run.sh activate\`"
+    fi
+fi
+
+if [[ $HANDLED != 1 ]]; then
+    if [[ "$#" == "1" && "$1" == "activate" ]]; then
+        if [[ "$0" = "$BASH_SOURCE" ]]; then
+            echo "You need to run as 'source ./run.sh $1'"
+            exit 1
+        fi
+    fi
+
+    exec ./tools/venv "$@"
+fi

setup.py

@@ -1,8 +1,8 @@
-from setuptools import setup, find_packages
-
+from setuptools import find_packages, setup
 import runpy
 import os
 
+
 VERSION = runpy.run_path(
     os.path.join(os.path.dirname(__file__), "alt_pytest_asyncio", "version.py")
 )["VERSION"]
@@ -23,7 +23,7 @@
     , extras_require =
       { 'tests':
         [ 'pytest==6.2.4'
-        , 'noseOfYeti==2.0.2'
+        , 'noseOfYeti[black]==2.4.1'
         , "nest-asyncio==1.0.0"
         ]
       }