Skip to content

Commit

Permalink
Merge pull request #40 from ambitioninc/develop
Browse files Browse the repository at this point in the history
1.2.0
  • Loading branch information
somewes authored Jul 11, 2019
2 parents 8880066 + cf0fd9e commit 331930f
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 22 deletions.
19 changes: 8 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
dist: xenial
language: python

sudo: false

python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"
- "3.7"

env:
matrix:
- DJANGO=1.11
- DJANGO=2.0
- DJANGO=2.1
- DJANGO=2.2
- DJANGO=master

addons:
postgresql: '9.5'
postgresql: '9.6'

matrix:
exclude:
- { python: "3.7", env: DJANGO=2.0 }

include:
- { python: "3.6", env: TOXENV=flake8 }

exclude:
- { python: "2.7", env: DJANGO=master }
- { python: "2.7", env: DJANGO=2.0 }
- { python: "3.4", env: DJANGO=master }

allow_failures:
- env: DJANGO=master

Expand Down
11 changes: 6 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,28 @@ def get_version():
version=get_version(),
description='Make templates that manage models',
long_description=open('README.md').read(),
long_description_content_type='text/markdown',
url='https://github.com/ambitioninc/django-smart-manager',
author='Wes Kendall',
author_email='[email protected]',
keywords='Django, Models, ORM, Manager, Templates',
packages=find_packages(),
classifiers=[
'Programming Language :: Python',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Framework :: Django',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Framework :: Django :: 2.2',
],
license='MIT',
install_requires=[
'Django>=1.11',
'django-manager-utils>=1.0.0',
'Django>=2.0',
'django-manager-utils>=1.4.0',
'jsonfield>=0.9.20',
],
tests_require=[
Expand Down
6 changes: 6 additions & 0 deletions smart_manager/docs/release_notes.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Release Notes
=============

v1.2.0
------
* Python 3.7
* Django 2.1
* Django 2.2

v1.1.0
------
* Tox
Expand Down
2 changes: 1 addition & 1 deletion smart_manager/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.1.0'
__version__ = '1.2.0'
13 changes: 8 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
[tox]
envlist =
flake8
py{27,34,35,36}-django111
py{34,35,36}-django20
py{35,36}-djangomaster
py{36}-django20
py{36,37}-django21
py{36,37}-django22
py{36,37}-djangomaster

[testenv]
setenv =
DB = postgres
deps =
django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3
djangomaster: https://github.com/django/django/archive/master.tar.gz
-rrequirements/requirements-testing.txt
commands =
Expand All @@ -23,6 +25,7 @@ commands = flake8 smart_manager

[travis:env]
DJANGO =
1.11: django111
2.0: django20
2.1: django21
2.2: django22
master: djangomaster

0 comments on commit 331930f

Please sign in to comment.