Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update supported Python/Django versions and fix packaging #254

Merged
merged 5 commits into from
Sep 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: 3.7.9
python-version: 3.11.5
- name: Install flake8
run: pip install flake8
- name: Run flake8
uses: suo/flake8-github-action@releases/v1
with:
checkName: 'flake8'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v1
Expand Down
7 changes: 7 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
History
=======

2.2.0
-----

* Remove support for Django < 3.2
* Remove support for Python 3.7
* Fix trove classifiers

2.1.0
-----

Expand Down
8 changes: 2 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,12 @@ django-organizations
* - Author
- Ben Lopatin (http://benlopatin.com)
* - Status
- |docs| |travis| |version| |wheel| |supported-versions| |supported-implementations|
- |docs| |version| |wheel| |supported-versions| |supported-implementations|

.. |docs| image:: https://readthedocs.org/projects/django-organizations/badge/?style=flat
:target: https://readthedocs.org/projects/django-organizations
:alt: Documentation Status

.. |travis| image:: https://travis-ci.org/bennylope/django-organizations.svg?branch=master
:alt: Travis-CI Build Status
:target: https://travis-ci.org/bennylope/django-organizations

.. |version| image:: https://img.shields.io/pypi/v/django-organizations.svg?style=flat
:alt: PyPI Package latest release
:target: https://pypi.python.org/pypi/django-organizations
Expand Down Expand Up @@ -88,7 +84,7 @@ Targets & testing

The codebase is targeted and tested against:

* Django 3.2.x against Python 3.7, 3.8, 3.9, 3.10
* Django 3.2.x against Python 3.8, 3.9, 3.10
* Django 4.1.x against Python 3.8, 3.9, 3.10, 3.11
* Django 4.2.x against Python 3.8, 3.9, 3.10, 3.11

Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@

# General information about the project.
project = "django-organizations"
copyright = "2012-2021, Ben Lopatin and contributors"
copyright = "2012-2023, Ben Lopatin and contributors"

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = "2.0"
version = "2.2"
# The full version, including alpha/beta/rc tags.
release = "2.0.2"
release = "2.2.0"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
26 changes: 13 additions & 13 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,35 @@ author = Ben Lopatin
author_email = [email protected]
url = https://github.com/bennylope/django-organizations/
description = Group accounts for Django
long_description = file: README.rst, HISTORY.rst
long_description = file: README.rst
license = BSD License
platforms =
OS Independent

[options]
zip_safe = False
include_package_data = True
packages = find:
package_dir=
=src
install_requires =
six
Django>=2.2.0
typing; python_version<"3.6"
classifiers =
Framework :: Django
Environment :: Web Environment
Intended Audience :: Developers
License :: OSI Approved :: BSD License
Operating System :: OS Independent
Programming Language :: Python
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
Programming Language :: Python :: Implementation :: CPython
Development Status :: 5 - Production/Stable

[options]
zip_safe = False
include_package_data = True
packages = find:
package_dir=
=src
install_requires =
six
Django>=3.2.0
python_requires = >=3.8

[options.packages.find]
where=src

Expand Down
3 changes: 1 addition & 2 deletions src/organizations/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

__author__ = "Ben Lopatin"
__email__ = "[email protected]"
__version__ = "2.1.0"
__version__ = "2.2.0"
4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[tox]
envlist =
flake8,
py{37,38,39,310}-django{32},
py{38,39,310}-django{32},
py{38,39,310,311}-django{41},
py{38,39,310,311}-django{42},

[gh-actions]
python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310
Expand All @@ -18,7 +17,6 @@ setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/organizations
commands = pytest {posargs} --cov=organizations
basepython =
py37: python3.7
py38: python3.8
py39: python3.9
py310: python3.10
Expand Down