From 2fa5833ad4be613f04a7fc480a6258c55a25a338 Mon Sep 17 00:00:00 2001 From: Lars Kreisz Date: Thu, 26 Apr 2018 23:30:27 +0200 Subject: [PATCH] Update build matrix (#75) * Update travis for Python 3.6 (#71) * Update travis for Python 3.6 * Update travis excludes * Prevent call of setup test * seems like nose already calls this * updated build matrix * works fine without * fix fragile yaml syntax * django20 is compatible with py34 * drop py33, added py36 classifier * updated versions, remove pypi downloads shield --- .travis.yml | 24 ++++++++++++++++-------- README.rst | 4 +--- setup.py | 2 +- tests/__init__.py | 4 ---- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09196ef..e3b9897 100755 --- a/.travis.yml +++ b/.travis.yml @@ -2,26 +2,34 @@ language: python sudo: false python: - "2.7" - - "3.3" - "3.4" - "3.5" + - "3.6" env: - REQUIREMENTS="django>=1.8,<1.9" - REQUIREMENTS="django>=1.9,<1.10" - REQUIREMENTS="django>=1.10,<1.11" + - REQUIREMENTS="django>=1.11,<2.0" + - REQUIREMENTS="django>=2.0,<2.1" - REQUIREMENTS="https://github.com/django/django/archive/master.tar.gz" matrix: exclude: - - python: "3.3" + - python: "2.7" + env: REQUIREMENTS="django>=2.0,<2.1" + - python: "2.7" + env: REQUIREMENTS="https://github.com/django/django/archive/master.tar.gz" + - python: "3.4" env: REQUIREMENTS="https://github.com/django/django/archive/master.tar.gz" - - python: "3.3" - env: REQUIREMENTS="django>=1.9,<1.10" - - python: "3.3" - env: REQUIREMENTS="django>=1.10,<1.11" - - python: "3.5" - env: REQUIREMENTS="django>=1.7,<1.8" - python: "3.5" env: REQUIREMENTS="django>=1.8,<1.9" + - python: "3.6" + env: REQUIREMENTS="django>=1.8,<1.9" + - python: "3.6" + env: REQUIREMENTS="django>=1.9,<1.10" + - python: "3.6" + env: REQUIREMENTS="django>=1.10,<1.11" + - python: "3.6" + env: REQUIREMENTS="django>=1.11,<2.0" allow_failures: - env: REQUIREMENTS="https://github.com/django/django/archive/master.tar.gz" cache: diff --git a/README.rst b/README.rst index 0c6a3d5..2e0ca18 100644 --- a/README.rst +++ b/README.rst @@ -2,8 +2,6 @@ :target: https://travis-ci.org/kraiz/django-crontab .. image:: https://img.shields.io/coveralls/kraiz/django-crontab/master.svg :target: https://coveralls.io/r/kraiz/django-crontab -.. image:: https://img.shields.io/pypi/dw/django-crontab.svg - :target: https://pypi.python.org/pypi/django-crontab .. image:: https://img.shields.io/pypi/v/django-crontab.svg :target: https://pypi.python.org/pypi/django-crontab .. image:: https://img.shields.io/pypi/pyversions/django-crontab.svg @@ -14,7 +12,7 @@ about ===== -dead simple crontab powered job scheduling for django (1.8+). +dead simple crontab powered job scheduling for django (1.8-2.0). setup ===== diff --git a/setup.py b/setup.py index a2ee28e..98beb81 100644 --- a/setup.py +++ b/setup.py @@ -30,9 +30,9 @@ 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', 'Topic :: System :: Installation/Setup' ] ) diff --git a/tests/__init__.py b/tests/__init__.py index 61e0d75..3c7ad93 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,7 +1,3 @@ import os -from django.test.utils import setup_test_environment - - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") -setup_test_environment()