Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mozmeao/django-allow-cidr
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.5.0
Choose a base ref
...
head repository: mozmeao/django-allow-cidr
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.6.0
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Jan 4, 2023

  1. Drop now-redundant dev deps; pare down setup.py as we no longer publi… 

    …sh from the command line
    @stevejalim
    stevejalim committed Jan 4, 2023
    Copy the full SHA
    daf41fa View commit details

Commits on Jan 5, 2023

  1. Add Python 3.11 and Django 4.1 to CI; Drop Python 3.6

    @stevejalim
    stevejalim committed Jan 5, 2023
    Copy the full SHA
    a777928 View commit details

  2. Bump version to 0.6.0 due to Python support change; update history doc

    @stevejalim
    stevejalim committed Jan 5, 2023
    Copy the full SHA
    189a3f8 View commit details
Showing with 18 additions and 28 deletions.
  1. +8 −3 .github/workflows/ci.yml
  2. +7 −0 HISTORY.rst
  3. +1 −1 allow_cidr/__init__.py
  4. +0 −3 requirements_dev.txt
  5. +2 −21 setup.py
11 changes: 8 additions & 3 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
@@ -12,28 +12,33 @@ jobs:
strategy:
matrix:
python-version:
- "3.6"
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"

django-tox-env:
- "django22"
- "django32"
- "django40"
- "django41"

exclude:
# We don't want every combination of the above, as some are not compatible
- python-version: "3.6"
django-tox-env: "django40"

- python-version: "3.7"
django-tox-env: "django40"

- python-version: "3.7"
django-tox-env: "django41"

- python-version: "3.10"
django-tox-env: "django22"

- python-version: "3.11"
django-tox-env: "django22"

name: Python ${{ matrix.python-version }} in use with ${{ matrix.django-tox-env }}
steps:
- uses: actions/checkout@v2
7 changes: 7 additions & 0 deletions HISTORY.rst
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,13 @@
History
-------

0.6.0 (2023-01-05)
++++++++++++++++++

* Drop dev-related dependencies (incl vulnerable version of wheel, which was not installed in general use)
* Remove redundant code from setup.py now we're auto-publishing via Github
* Update testing matrix: Drop Python 3.6; add Python 3.11; add Django 4.1

0.5.0 (2022-07-09)
++++++++++++++++++

2 changes: 1 addition & 1 deletion allow_cidr/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.5.0"
__version__ = "0.6.0"
3 changes: 0 additions & 3 deletions requirements_dev.txt
View file

This file was deleted.

23 changes: 2 additions & 21 deletions setup.py
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@
# -*- coding: utf-8 -*-
import os
import re
import sys

try:
from setuptools import setup
@@ -22,25 +21,6 @@ def get_version(*file_paths):

version = get_version("allow_cidr", "__init__.py")


if sys.argv[-1] == "publish":
try:
import wheel

print("Wheel version: ", wheel.__version__)
except ImportError:
print('Wheel library missing. Please run "pip install wheel"')
sys.exit()
os.system("python setup.py sdist upload")
os.system("python setup.py bdist_wheel upload")
sys.exit()

if sys.argv[-1] == "tag":
print("Tagging the version on git:")
os.system("git tag -a %s -m 'version %s'" % (version, version))
os.system("git push --tags")
sys.exit()

readme = open("README.rst").read()
history = open("HISTORY.rst").read().replace(".. :changelog:", "")

@@ -69,13 +49,14 @@ def get_version(*file_paths):
"Framework :: Django :: 2.2",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
"Framework :: Django :: 4.1",
"Intended Audience :: Developers",
"License :: OSI Approved :: Apache Software License",
"Natural Language :: English",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
],
)