Skip to content

Commit

Permalink
Remove old versions
Browse files Browse the repository at this point in the history
  • Loading branch information
spapas committed Jan 14, 2024
1 parent eb064c0 commit 4bf123e
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 57 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gh.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: [2.7, 3.8, 3.11]
python-version: [3.8, 3.11]

steps:
- uses: actions/checkout@v1
Expand Down
12 changes: 0 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,10 @@ install:
script:
- tox
env:
- TOXENV=py27-django18
- TOXENV=py27-django19
- TOXENV=py27-django110
- TOXENV=py27-django111
- TOXENV=py38-django111
- TOXENV=py38-django20
- TOXENV=py38-django21
- TOXENV=py38-django22
- TOXENV=py38-django30
- TOXENV=py38-django31
- TOXENV=py38-django32
- TOXENV=py38-django40
- TOXENV=py38-django41
- TOXENV=py38-django42
- TOXENV=py311-django30
- TOXENV=py311-django31
- TOXENV=py311-django32
- TOXENV=py311-django40
- TOXENV=py311-django41
Expand Down
37 changes: 18 additions & 19 deletions quicktest.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,34 +51,33 @@ def run_tests(self):
'SECRET_KEY':'123',
}

if django.VERSION >= (1, 8, 0):
django_settings['TEMPLATES'] = [{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
},
}]

django_settings['TEMPLATES'] = [{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
},
}]

django_settings['MIDDLEWARE'] = [
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware'
]

if django.VERSION >= (3, 2, 0):
django_settings['DEFAULT_AUTO_FIELD'] = 'django.db.models.BigAutoField'

django_settings['DEFAULT_AUTO_FIELD'] = 'django.db.models.BigAutoField'

settings.configure(**django_settings)

if django.VERSION >= (1, 7, 0):
# see: https://docs.djangoproject.com/en/dev/releases/1.7/#standalone-scripts
django.setup()

django.setup()


from django.test.runner import DiscoverRunner as Runner
Expand Down
16 changes: 3 additions & 13 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def readme():

setup(
name='django-generic-scaffold',
version='0.5.8',
version='0.6.0',
description='Generic scaffolding for Django',
long_description=readme(),
author='Serafeim Papastefanos',
Expand All @@ -18,25 +18,15 @@ def readme():
include_package_data=True,
packages=find_packages(exclude=['tests.*', 'tests',]),

install_requires=['Django >=1.8', 'six'],
install_requires=['Django >=3.2', 'six'],

classifiers=[
'Environment :: Web Environment',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.11',
'Framework :: Django',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
Expand Down
13 changes: 1 addition & 12 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
[tox]
envlist = {py27}-django{18,19,110,111}, {py38}-django{111,20,21,22,30,31,32,40,41,42}, {py311}-django{30,31,32,40,41,42,50}
envlist = {py38}-django{32,40,41,42}, {py311}-django{32,40,41,42,50}

[testenv]
basepython =
py27: python
py38: python3.8
py311: python3.11
deps =
pytest
django18: Django>=1.8,<1.9
django19: Django>=1.9.9,<1.10
django110: Django>=1.10.2,<1.11
django111: Django>=1.11,<1.12
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
django32: Django>=3.2,<3.3
django40: Django>=4.0,<4.1
django41: Django>=4.1,<4.2
Expand All @@ -27,6 +17,5 @@ commands = python quicktest.py

[gh-actions]
python =
2.7: py27
3.8: py38
3.11: py311

0 comments on commit 4bf123e

Please sign in to comment.