diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 1f3fc51..ed27eaa 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -6,7 +6,7 @@ inputs: python_version: description: The Python version. required: false - default: '3.11.1' + default: '3.11' poetry_version: description: The Poetry version. required: false diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 515dff6..f5b1a57 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,30 +10,54 @@ jobs: test: runs-on: ubuntu-latest timeout-minutes: 30 + strategy: + fail-fast: false + matrix: + python: + - '3.10' + - '3.11' steps: - name: Checkout uses: actions/checkout@v3 - name: Setup uses: ./.github/actions/setup + with: + python_version: ${{ matrix.python }} - name: Test run: make test lint: runs-on: ubuntu-latest timeout-minutes: 30 + strategy: + fail-fast: false + matrix: + python: + - '3.10' + - '3.11' steps: - name: Checkout uses: actions/checkout@v3 - name: Setup uses: ./.github/actions/setup + with: + python_version: ${{ matrix.python }} - name: Lint run: make lint build: runs-on: ubuntu-latest timeout-minutes: 30 + strategy: + fail-fast: false + matrix: + python: + - '3.10' + - '3.11' steps: - name: Checkout uses: actions/checkout@v3 - name: Setup uses: ./.github/actions/setup + with: + python_version: ${{ matrix.python }} - name: Build run: make build diff --git a/poetry.lock b/poetry.lock index f31529f..035d73b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -14,7 +14,10 @@ files = [ [package.dependencies] lazy-object-proxy = ">=1.4.0" -wrapt = {version = ">=1.14,<2", markers = "python_version >= \"3.11\""} +wrapt = [ + {version = ">=1.11,<2", markers = "python_version < \"3.11\""}, + {version = ">=1.14,<2", markers = "python_version >= \"3.11\""}, +] [[package]] name = "attrs" @@ -62,6 +65,7 @@ click = ">=8.0.0" mypy-extensions = ">=0.4.3" pathspec = ">=0.9.0" platformdirs = ">=2" +tomli = {version = ">=1.1.0", markers = "python_full_version < \"3.11.0a7\""} [package.extras] colorama = ["colorama (>=0.4.3)"] @@ -157,6 +161,9 @@ files = [ {file = "coverage-7.0.2.tar.gz", hash = "sha256:405d8528a0ea07ca516d9007ecad4e1bd10e2eeef27411c6188d78c4e2dfcddc"}, ] +[package.dependencies] +tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""} + [package.extras] toml = ["tomli"] @@ -186,6 +193,21 @@ files = [ {file = "docopt-0.6.2.tar.gz", hash = "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"}, ] +[[package]] +name = "exceptiongroup" +version = "1.1.0" +description = "Backport of PEP 654 (exception groups)" +category = "dev" +optional = false +python-versions = ">=3.7" +files = [ + {file = "exceptiongroup-1.1.0-py3-none-any.whl", hash = "sha256:327cbda3da756e2de031a3107b81ab7b3770a602c4d16ca618298c526f4bec1e"}, + {file = "exceptiongroup-1.1.0.tar.gz", hash = "sha256:bcb67d800a4497e1b404c2dd44fca47d3b7a5e5433dbab67f96c1a685cdfdf23"}, +] + +[package.extras] +test = ["pytest (>=6)"] + [[package]] name = "iniconfig" version = "1.1.1" @@ -340,10 +362,14 @@ files = [ [package.dependencies] astroid = ">=2.12.13,<=2.14.0-dev0" colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} -dill = {version = ">=0.3.6", markers = "python_version >= \"3.11\""} +dill = [ + {version = ">=0.2", markers = "python_version < \"3.11\""}, + {version = ">=0.3.6", markers = "python_version >= \"3.11\""}, +] isort = ">=4.2.5,<6" mccabe = ">=0.6,<0.8" platformdirs = ">=2.2.0" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} tomlkit = ">=0.10.1" [package.extras] @@ -365,9 +391,11 @@ files = [ [package.dependencies] attrs = ">=19.2.0" colorama = {version = "*", markers = "sys_platform == \"win32\""} +exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} iniconfig = "*" packaging = "*" pluggy = ">=0.12,<2.0" +tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} [package.extras] testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "xmlschema"] @@ -424,6 +452,18 @@ docopt = ">=0.4.0" pytest = ">=2.6.4" watchdog = ">=0.6.0" +[[package]] +name = "tomli" +version = "2.0.1" +description = "A lil' TOML parser" +category = "dev" +optional = false +python-versions = ">=3.7" +files = [ + {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, + {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, +] + [[package]] name = "tomlkit" version = "0.11.6" @@ -553,5 +593,5 @@ files = [ [metadata] lock-version = "2.0" -python-versions = "^3.11.0" -content-hash = "b470d52522d0b95bd7d894c1a5d9182c717ed5650091669789de3f90e492ff56" +python-versions = "^3.10.0" +content-hash = "615ba72e93ee7ce811baed14fec89a88aed4e5e9a454bd54bab5ef90fea6f601" diff --git a/pyproject.toml b/pyproject.toml index a1b4e42..89e9258 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ homepage = "https://github.com/makenew/pypackage" repository = "https://github.com/makenew/pypackage" [tool.poetry.dependencies] -python = "^3.11.0" +python = "^3.10.0" [tool.poetry.dev-dependencies] black = "^22.3.0"