Skip to content

Commit

Permalink
Merge pull request #95 from ambitioninc/develop
Browse files Browse the repository at this point in the history
1.1.0
  • Loading branch information
somewes authored Mar 27, 2018
2 parents ef9117f + 113a7d8 commit b8c1fd4
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 14 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ docs/_build/

# Test database
test_ambition_dev

.tox/
46 changes: 35 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,47 @@
sudo: true
language: python

sudo: false

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

env:
global:
- DB=postgres
matrix:
- DJANGO=">=1.11,<2.0"
- DJANGO=">=2.0,<2.1"
- DJANGO=1.10
- DJANGO=1.11
- DJANGO=2.0
- DJANGO=master

addons:
postgresql: '9.5'

matrix:
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 }
- { python: "3.6", env: DJANGO=1.10 }

allow_failures:
- env: DJANGO=master

install:
- pip install -q coverage coveralls flake8 Django$DJANGO django-nose>=1.4
- pip install tox-travis

before_script:
- psql -c 'CREATE DATABASE querybuilder;' -U postgres

script:
- flake8 ./querybuilder
- coverage run setup.py test
- coverage report --fail-under=90
- tox

after_success:
coveralls

notifications:
email: false
5 changes: 4 additions & 1 deletion docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ Before a new release, please go through the following checklist:
* Upload to pypi::

pip install wheel
python setup.py sdist bdist_wheel upload
pip install twine
python setup.py clean --all
python setup.py register sdist bdist_wheel
twine upload dist/*

Vulnerability Reporting
-----------------------
Expand Down
4 changes: 4 additions & 0 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Release Notes
=============

v1.1.0
------
* Use tox to support more versions

v1.0.0
------
* Drop Django 1.9
Expand Down
2 changes: 1 addition & 1 deletion querybuilder/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.0.0'
__version__ = '1.1.0'
10 changes: 10 additions & 0 deletions requirements/requirements-testing.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
pytz
fleming
six
psycopg2
django-nose>=1.4
django-dynamic-fixture
jsonfield==0.9.20
mock
coverage
coveralls
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,22 @@ def get_version():
packages=find_packages(),
classifiers=[
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Framework :: Django',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Development Status :: 5 - Production/Stable',
],
license='MIT',
install_requires=[
'Django>=1.11',
'Django>=1.10',
'pytz>=2015.6',
'fleming>=0.4.4',
'six',
Expand Down
31 changes: 31 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[tox]
envlist =
flake8
py{27,34,35}-django110
py{27,34,35,36}-django111
py{34,35,36}-django20
py{35,36}-djangomaster

[testenv]
setenv =
DB = postgres
deps =
django110: Django>=1.10,<1.11
django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1
djangomaster: https://github.com/django/django/archive/master.tar.gz
-rrequirements/requirements-testing.txt
commands =
coverage run setup.py test
coverage report --fail-under=90

[testenv:flake8]
deps = flake8
commands = flake8 querybuilder

[travis:env]
DJANGO =
1.10: django110
1.11: django111
2.0: django20
master: djangomaster

0 comments on commit b8c1fd4

Please sign in to comment.