Skip to content

Commit

Permalink
Bumped version to 0.2.3 and modified tox/CI config
Browse files Browse the repository at this point in the history
  • Loading branch information
vmagamedov committed Feb 1, 2017
1 parent f17f63e commit dffc5be
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 79 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ python:
- "pypy"

env:
- SQLA_VERSION=0.7
- SQLA_VERSION=0.8
- SQLA_VERSION=0.9
- SQLA_VERSION=1.0
- SQLA_VERSION=1.1
- SQLA_VERSION=dev

install:
- pip install tox-travis
Expand Down
14 changes: 8 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -257,13 +257,15 @@ Modified final ``Construct`` definition:
Installation
============

To install `SQLConstruct`, simply::
To install `SQLConstruct`, simply:

pip install https://github.com/vmagamedov/sqlconstruct/archive/rev-0.2.zip
.. code-block:: shell
`SQLConstruct` is tested and supported on these Python versions: 2.7 and 3.3;
PyPy is also supported. Supported `SQLAlchemy` versions includes 0.7, 0.8
and 0.9.
$ pip install sqlconstruct
Tested `Python` versions: 2.7, 3.4, PyPy.

Tested `SQLAlchemy` versions: 0.7, 0.8, 0.9, 1.0, 1.1.

Examples above are using `SQLAlchemy` >= 0.9, if you are using older versions,
you will have to do next changes in your project configuration:
Expand All @@ -277,7 +279,7 @@ you will have to do next changes in your project configuration:
pass
session = Session(engine, query_cls=Query)
Flask-SQLAlchemy:

.. code-block:: python
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

setup(
name='SQLConstruct',
version='0.2.2',
version='0.2.3',
description='Functional approach to query database using SQLAlchemy',
long_description=README,
author='Vladimir Magamedov',
Expand Down
2 changes: 1 addition & 1 deletion sqlconstruct.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
from sqlalchemy.orm.attributes import QueryableAttribute


__version__ = '0.2.1'
__version__ = '0.2.3'

_PY3 = sys.version_info[0] == 3

Expand Down
82 changes: 12 additions & 70 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
[tox]
envlist = py{27,34,py}-sqla{07,08,09,10,11}

[testenv]
commands =
python -m unittest tests
deps =
py{27,py}: mock
sqla07: sqlalchemy>=0.7,<0.8
sqla08: sqlalchemy>=0.8,<0.9
sqla09: sqlalchemy>=0.9,<1.0
sqla10: sqlalchemy>=1.0,<1.1
sqla11: sqlalchemy>=1.1,<1.2

[travis]
python =
Expand All @@ -10,76 +20,8 @@ python =

[travis:env]
SQLA_VERSION =
0.7: sqla07
0.8: sqla08
0.9: sqla09
1.0: sqla10
1.1: sqla11
dev: sqladev

[testenv:py27-sqla09]
basepython = python2.7
deps =
mock
https://github.com/zzzeek/sqlalchemy/archive/rel_0_9.zip

[testenv:py27-sqla10]
basepython = python2.7
deps =
mock
https://github.com/zzzeek/sqlalchemy/archive/rel_1_0.zip

[testenv:py27-sqla11]
basepython = python2.7
deps =
mock
https://github.com/zzzeek/sqlalchemy/archive/rel_1_1.zip

[testenv:py27-sqladev]
basepython = python2.7
deps =
mock
https://github.com/zzzeek/sqlalchemy/archive/master.zip

[testenv:py34-sqla09]
basepython = python3.4
deps =
https://github.com/zzzeek/sqlalchemy/archive/rel_0_9.zip

[testenv:py34-sqla10]
basepython = python3.4
deps =
https://github.com/zzzeek/sqlalchemy/archive/rel_1_0.zip

[testenv:py34-sqla11]
basepython = python3.4
deps =
https://github.com/zzzeek/sqlalchemy/archive/rel_1_1.zip

[testenv:py34-sqladev]
basepython = python3.4
deps =
https://github.com/zzzeek/sqlalchemy/archive/master.zip


[testenv:pypy-sqla09]
basepython = pypy
deps =
mock
https://github.com/zzzeek/sqlalchemy/archive/rel_0_9.zip

[testenv:pypy-sqla10]
basepython = pypy
deps =
mock
https://github.com/zzzeek/sqlalchemy/archive/rel_1_0.zip

[testenv:pypy-sqla11]
basepython = pypy
deps =
mock
https://github.com/zzzeek/sqlalchemy/archive/rel_1_1.zip

[testenv:pypy-sqladev]
basepython = pypy
deps =
mock
https://github.com/zzzeek/sqlalchemy/archive/master.zip

0 comments on commit dffc5be

Please sign in to comment.