diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index f73f067..2d36355 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -10,15 +10,6 @@ concurrency: cancel-in-progress: true jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - uses: pre-commit/action@v3.0.0 - test: name: test ${{ matrix.py }} - ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -26,15 +17,16 @@ jobs: fail-fast: false matrix: py: + - "3.11.0-beta.4" - "3.10" - - "pypy-3.7-v7.3.7" # ahead to start it earlier because takes longer + - "pypy-3.7-v7.3.9" # ahead to start it earlier because takes longer - "3.9" - "3.8" - "3.7" os: - - ubuntu-20.04 + - ubuntu-22.04 - windows-2022 - - macos-10.15 + - macos-12 steps: - name: Setup python for tox @@ -52,16 +44,11 @@ jobs: python-version: ${{ matrix.py }} - name: Pick environment to run run: | - import codecs - import os - import platform - import sys - cpy = platform.python_implementation() == "CPython" - base =("{}{}{}" if cpy else "{}{}").format("py" if cpy else "pypy", *sys.version_info[0:2]) - env = "TOXENV={}\n".format(base) - print("Picked:\n{}for{}".format(env, sys.version)) - with codecs.open(os.environ["GITHUB_ENV"], "a", "utf-8") as file_handler: - file_handler.write(env) + import os; import platform; import sys; from pathlib import Path + env = f'TOXENV=py{"" if platform.python_implementation() == "CPython" else "py"}3{sys.version_info.minor}' + print(f"Picked: {env} for {sys.version} based of {sys.executable}") + with Path(os.environ["GITHUB_ENV"]).open("ta") as file_handler: + file_handler.write(env) shell: python - name: Setup test suite run: tox -vv --notest @@ -82,7 +69,7 @@ jobs: coverage: name: Combine coverage - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: test steps: - uses: actions/checkout@v3 @@ -119,8 +106,8 @@ jobs: fail-fast: false matrix: os: - - ubuntu-latest - - windows-latest + - ubuntu-22.04 + - windows-2022 tox_env: - dev - type @@ -145,8 +132,8 @@ jobs: publish: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') - needs: [ check, coverage, lint ] - runs-on: ubuntu-latest + needs: [ check, coverage ] + runs-on: ubuntu-22.04 steps: - name: Setup python to build package uses: actions/setup-python@v4 @@ -160,7 +147,7 @@ jobs: - name: Build sdist and wheel run: python -m build -s -w . -o dist - name: Publish to PyPi - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@v1.5.1 with: skip_existing: true user: __token__ diff --git a/src/filelock/main.pdf b/src/filelock/main.pdf new file mode 100644 index 0000000..72d3411 Binary files /dev/null and b/src/filelock/main.pdf differ diff --git a/tox.ini b/tox.ini index 5f0e3a7..47d3914 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,7 @@ [tox] envlist = fix_lint + py311 py310 py39 py38 @@ -36,7 +37,7 @@ wheel_build_env = .pkg description = format the code base to adhere to our styles, and complain about what we cannot do automatically passenv = * -basepython = python3.9 +basepython = python3.10 skip_install = true deps = pre-commit>=2 @@ -74,6 +75,7 @@ commands = coverage html -d {toxworkdir}/htmlcov diff-cover --compare-branch {env:DIFF_AGAINST:origin/main} {toxworkdir}/coverage.xml depends = + py311 py310 py39 py38