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 version determination #135

Merged
merged 2 commits into from
Aug 24, 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
11 changes: 1 addition & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
max-parallel: 5
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', 'pypy-3.10']
python-version: ['3.8', '3.9', '3.10', 'pypy-3.10']
django-version: ['2.2', '3.2', '4.0', '4.1', '4.2']
include:
# Tox configuration for QA environment
Expand All @@ -24,15 +24,6 @@ jobs:
django-version: 'main'
experimental: true
exclude:
# Exclude Django 4.0 for Python 3.7
- python-version: '3.7'
django-version: '4.0'
# Exclude Django 4.1 for Python 3.7
- python-version: '3.7'
django-version: '4.1'
# Exclude Django 4.2 for Python 3.7
- python-version: '3.7'
django-version: '4.2'
# Exclude Django 2.2 for Python 3.10
- python-version: '3.10'
django-version: '2.2'
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
long_description=open("README.rst").read() + "\n\n" + open("CHANGES.rst").read(),
long_description_content_type="text/x-rst",
license="MIT license",
python_requires=">=3.7",
python_requires=">=3.8",
requires=["django (>=2.2)"],
packages=["widget_tweaks", "widget_tweaks.templatetags"],
classifiers=[
Expand All @@ -27,7 +27,6 @@
"License :: OSI Approved :: MIT License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
envlist =
py{37,38,39,py3}-dj22
py{37,38,39,310,py3}-dj32
py{38,39,py3}-dj22
py{38,39,310,py3}-dj32
py{38,39,310,py3}-dj40
py{38,39,310,py3}-dj41
py{38,39,310,py3}-dj42
Expand All @@ -10,7 +10,6 @@ envlist =

[gh-actions]
python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310
Expand Down
8 changes: 2 additions & 6 deletions widget_tweaks/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
from pkg_resources import get_distribution, DistributionNotFound
from importlib.metadata import version

try:
__version__ = get_distribution("django-widget-tweaks").version
except DistributionNotFound:
# package is not installed
__version__ = None
__version__ = version("django-widget-tweaks")