Skip to content

Commit dffc5be

Browse files
committed
Bumped version to 0.2.3 and modified tox/CI config
1 parent f17f63e commit dffc5be

File tree

5 files changed

+24
-79
lines changed

5 files changed

+24
-79
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ python:
88
- "pypy"
99

1010
env:
11+
- SQLA_VERSION=0.7
12+
- SQLA_VERSION=0.8
1113
- SQLA_VERSION=0.9
1214
- SQLA_VERSION=1.0
1315
- SQLA_VERSION=1.1
14-
- SQLA_VERSION=dev
1516

1617
install:
1718
- pip install tox-travis

README.rst

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,13 +257,15 @@ Modified final ``Construct`` definition:
257257
Installation
258258
============
259259

260-
To install `SQLConstruct`, simply::
260+
To install `SQLConstruct`, simply:
261261

262-
pip install https://github.com/vmagamedov/sqlconstruct/archive/rev-0.2.zip
262+
.. code-block:: shell
263263
264-
`SQLConstruct` is tested and supported on these Python versions: 2.7 and 3.3;
265-
PyPy is also supported. Supported `SQLAlchemy` versions includes 0.7, 0.8
266-
and 0.9.
264+
$ pip install sqlconstruct
265+
266+
Tested `Python` versions: 2.7, 3.4, PyPy.
267+
268+
Tested `SQLAlchemy` versions: 0.7, 0.8, 0.9, 1.0, 1.1.
267269

268270
Examples above are using `SQLAlchemy` >= 0.9, if you are using older versions,
269271
you will have to do next changes in your project configuration:
@@ -277,7 +279,7 @@ you will have to do next changes in your project configuration:
277279
pass
278280
279281
session = Session(engine, query_cls=Query)
280-
282+
281283
Flask-SQLAlchemy:
282284

283285
.. code-block:: python

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
setup(
1313
name='SQLConstruct',
14-
version='0.2.2',
14+
version='0.2.3',
1515
description='Functional approach to query database using SQLAlchemy',
1616
long_description=README,
1717
author='Vladimir Magamedov',

sqlconstruct.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
from sqlalchemy.orm.attributes import QueryableAttribute
4949

5050

51-
__version__ = '0.2.1'
51+
__version__ = '0.2.3'
5252

5353
_PY3 = sys.version_info[0] == 3
5454

tox.ini

Lines changed: 12 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1+
[tox]
2+
envlist = py{27,34,py}-sqla{07,08,09,10,11}
3+
14
[testenv]
25
commands =
36
python -m unittest tests
7+
deps =
8+
py{27,py}: mock
9+
sqla07: sqlalchemy>=0.7,<0.8
10+
sqla08: sqlalchemy>=0.8,<0.9
11+
sqla09: sqlalchemy>=0.9,<1.0
12+
sqla10: sqlalchemy>=1.0,<1.1
13+
sqla11: sqlalchemy>=1.1,<1.2
414

515
[travis]
616
python =
@@ -10,76 +20,8 @@ python =
1020

1121
[travis:env]
1222
SQLA_VERSION =
23+
0.7: sqla07
24+
0.8: sqla08
1325
0.9: sqla09
1426
1.0: sqla10
1527
1.1: sqla11
16-
dev: sqladev
17-
18-
[testenv:py27-sqla09]
19-
basepython = python2.7
20-
deps =
21-
mock
22-
https://github.com/zzzeek/sqlalchemy/archive/rel_0_9.zip
23-
24-
[testenv:py27-sqla10]
25-
basepython = python2.7
26-
deps =
27-
mock
28-
https://github.com/zzzeek/sqlalchemy/archive/rel_1_0.zip
29-
30-
[testenv:py27-sqla11]
31-
basepython = python2.7
32-
deps =
33-
mock
34-
https://github.com/zzzeek/sqlalchemy/archive/rel_1_1.zip
35-
36-
[testenv:py27-sqladev]
37-
basepython = python2.7
38-
deps =
39-
mock
40-
https://github.com/zzzeek/sqlalchemy/archive/master.zip
41-
42-
[testenv:py34-sqla09]
43-
basepython = python3.4
44-
deps =
45-
https://github.com/zzzeek/sqlalchemy/archive/rel_0_9.zip
46-
47-
[testenv:py34-sqla10]
48-
basepython = python3.4
49-
deps =
50-
https://github.com/zzzeek/sqlalchemy/archive/rel_1_0.zip
51-
52-
[testenv:py34-sqla11]
53-
basepython = python3.4
54-
deps =
55-
https://github.com/zzzeek/sqlalchemy/archive/rel_1_1.zip
56-
57-
[testenv:py34-sqladev]
58-
basepython = python3.4
59-
deps =
60-
https://github.com/zzzeek/sqlalchemy/archive/master.zip
61-
62-
63-
[testenv:pypy-sqla09]
64-
basepython = pypy
65-
deps =
66-
mock
67-
https://github.com/zzzeek/sqlalchemy/archive/rel_0_9.zip
68-
69-
[testenv:pypy-sqla10]
70-
basepython = pypy
71-
deps =
72-
mock
73-
https://github.com/zzzeek/sqlalchemy/archive/rel_1_0.zip
74-
75-
[testenv:pypy-sqla11]
76-
basepython = pypy
77-
deps =
78-
mock
79-
https://github.com/zzzeek/sqlalchemy/archive/rel_1_1.zip
80-
81-
[testenv:pypy-sqladev]
82-
basepython = pypy
83-
deps =
84-
mock
85-
https://github.com/zzzeek/sqlalchemy/archive/master.zip

0 commit comments

Comments
 (0)