From d4433838ee18525950ec8710ec2f8cd63075bf94 Mon Sep 17 00:00:00 2001 From: Hugo Rodger-Brown Date: Thu, 16 Nov 2023 12:40:59 +0000 Subject: [PATCH] Update version scheme --- .github/workflows/tox.yml | 43 +++++++++++++++++++++++++++++++++------ pyproject.toml | 13 ++++++------ 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 90ad656..71813b8 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - toxenv: [fmt,lint,mypy] + toxenv: [fmt, lint, mypy] env: TOXENV: ${{ matrix.toxenv }} @@ -22,7 +22,30 @@ jobs: - name: Check out the repository uses: actions/checkout@v4 - - name: Set up Python 3.11 + - name: Set up Python (3.11) + uses: actions/setup-python@v4 + with: + python-version: "3.11" + + - name: Install and run tox + run: | + pip install tox + tox + + checks: + name: Run Django checks + runs-on: ubuntu-latest + strategy: + matrix: + toxenv: ["django-checks"] + env: + TOXENV: ${{ matrix.toxenv }} + + steps: + - name: Check out the repository + uses: actions/checkout@v4 + + - name: Set up Python (3.11) uses: actions/setup-python@v4 with: python-version: "3.11" @@ -37,15 +60,23 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: ["3.10", "3.11", "3.12"] - django: [32,40,41,42,50,main] + python: ["3.8", "3.9", "3.10", "3.11", "3.12"] + # build LTS version, next version, HEAD + django: ["32", "42", "50", "main"] + exclude: + - python: "3.10" + django: "main" + - python: "3.11" + django: "32" + - python: "3.12" + django: "32" env: - TOXENV: py${{ matrix.python }}-django${{ matrix.django }} + TOXENV: django${{ matrix.django }}-py${{ matrix.python }} steps: - name: Check out the repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python }} uses: actions/setup-python@v4 diff --git a/pyproject.toml b/pyproject.toml index 24c08a2..97e3cc2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "django-zapier-trigger" -version = "1.0.beta4" +version = "2023.11.16" description = "Django (DRF) backed app for managing Zapier triggers." license = "MIT" authors = ["YunoJuno "] @@ -10,7 +10,6 @@ homepage = "https://github.com/yunojuno/django-zapier-trigger" repository = "https://github.com/yunojuno/django-zapier-trigger" documentation = "https://github.com/yunojuno/django-zapier-trigger" classifiers = [ - "Development Status :: 4 - Beta", "Environment :: Web Environment", "Framework :: Django", "Framework :: Django :: 3.2", @@ -33,16 +32,18 @@ django = "^3.2 || ^4.0 | ^5.0" requests = "*" djangorestframework = "*" -[tool.poetry.dev-dependencies] +[tool.poetry.group.dev.dependencies] black = "*" -coverage = "*" -factory-boy = "*" mypy = "*" pre-commit = "*" +ruff = "*" + +[tool.poetry.group.test.dependencies] +coverage = "*" +factory-boy = "*" pytest = "*" pytest-cov = "*" pytest-django = "*" -ruff = "*" tox = "*" [build-system]