From bf0abc0e9766e6d04ccc8f5d0f10dcf7ac54d071 Mon Sep 17 00:00:00 2001 From: Christopher Banck Date: Wed, 16 Mar 2022 08:55:34 +0100 Subject: [PATCH 1/3] test with django 4 and python 3.10 --- .github/workflows/ci.yml | 9 +++++++++ setup.cfg | 2 ++ tests/settings.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d0f56f..a54c68e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,13 +85,22 @@ jobs: - "3.7" - "3.8" - "3.9" + - "3.10" django-version: - "2.2.*" - "3.1.*" - "3.2.*" + - "4.0.*" extra: - "" - "progressbar" + exclude: + - python-version: "3.7" + django-version: "4.0.*" + - python-version: "3.10" + django-version: "3.1.*" + - python-version: "3.10" + django-version: "2.2.*" steps: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v3 diff --git a/setup.cfg b/setup.cfg index 696d7c0..3b0ff1f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,10 +23,12 @@ classifier = Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 Framework :: Django Framework :: Django :: 2.2 Framework :: Django :: 3.1 Framework :: Django :: 3.2 + Framework :: Django :: 4.0 python_requires = >=3.7 diff --git a/tests/settings.py b/tests/settings.py index 03ebbd9..480a744 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -45,4 +45,4 @@ SECRET_KEY = "foobar" -USE_L10N = True +USE_TZ = True From a37dbe23e1927821a5bf9d80ac4de218a2736883 Mon Sep 17 00:00:00 2001 From: Johannes Maron Date: Sat, 19 Mar 2022 15:59:17 +0100 Subject: [PATCH 2/3] Drop Django and Python EOL versions --- .github/workflows/ci.yml | 18 ++++-------------- setup.cfg | 5 +---- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a54c68e..671a50c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,25 +82,15 @@ jobs: strategy: matrix: python-version: - - "3.7" - "3.8" - "3.9" - - "3.10" + - "3.10" django-version: - - "2.2.*" - - "3.1.*" - - "3.2.*" - - "4.0.*" + - "3.2a" + - "4.0a" extra: - "" - "progressbar" - exclude: - - python-version: "3.7" - django-version: "4.0.*" - - python-version: "3.10" - django-version: "3.1.*" - - python-version: "3.10" - django-version: "2.2.*" steps: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v3 @@ -111,7 +101,7 @@ jobs: - run: python -m pip install --upgrade pip setuptools codecov wheel - run: python -m pip install .[${{ matrix.extra }}] if: ${{ matrix.extra }} - - run: python -m pip install django==${{ matrix.django-version }} + - run: python -m pip install django~=${{ matrix.django-version }} - name: Test with pytest run: python setup.py test - run: codecov diff --git a/setup.cfg b/setup.cfg index 3b0ff1f..10e8e2b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,17 +20,14 @@ classifier = Topic :: Software Development Programming Language :: Python :: 3 Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Framework :: Django - Framework :: Django :: 2.2 - Framework :: Django :: 3.1 Framework :: Django :: 3.2 Framework :: Django :: 4.0 -python_requires = >=3.7 +python_requires = >=3.8 [options] include_package_data = True From f79cb6400b9df5534b6e0b8473f4be234cb360fd Mon Sep 17 00:00:00 2001 From: Johannes Maron Date: Sat, 19 Mar 2022 15:59:38 +0100 Subject: [PATCH 3/3] Drop analyze CI build --- .github/workflows/ci.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 671a50c..22dbeec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,19 +8,6 @@ on: jobs: - analyze: - name: CodeQL - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: python - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 - msgcheck: runs-on: ubuntu-latest steps: