Skip to content

Commit d9094e7

Browse files
committed
cleanup a bit
1 parent 3a7f784 commit d9094e7

8 files changed

Lines changed: 26 additions & 18 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,6 @@ nosetests.xml
3535
.pydevproject
3636

3737
.doctest.log
38+
39+
.virtualenv
40+
.virtualenv3

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
language: python
22
python:
3-
- '2.6'
43
- '2.7'
5-
- '3.3'
64
- '3.4'
5+
- '3.5'
76
- pypy
87
before_install:
98
- sudo sh -c "echo 'deb http://dev.monetdb.org/downloads/deb/ precise monetdb' > /etc/apt/sources.list.d/monetdb.list"
@@ -25,9 +24,8 @@ before_install:
2524
install:
2625
- pip install --upgrade pip
2726
- pip install "sqlalchemy>= 0.8,<1.0"
28-
- pip install -r requirements.txt
2927
- pip install nose mock coverage
30-
- "./setup.py install"
28+
- pip install -e .
3129
script:
3230
- "./run_tests.py"
3331
branches:

CHANGES

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# 0.9.2
2+
3+
changes since 0.9.1
4+
5+
- fix issue #6 - limit_clause() got an unexpected keyword
6+
argument 'literal_binds' Thanks to Gustavo Brian.
7+
8+
19
# 0.9.1
210

311
changes since 0.9

requirements.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

requirements_dev.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
python-monetdb
2-
sqlalchemy
31
pytest
42
mock
5-
coverage
3+
coverage

setup.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ profile_file=.profiles.txt
1616
[db]
1717
default=monetdb://monetdb:monetdb@localhost:50000/test
1818

19+
[bdist_wheel]
20+
universal=1

setup.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,11 @@
55
from setuptools import find_packages, setup
66
import os
77

8-
from sqlalchemy_monetdb import __version__
9-
10-
118
readme = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
129

13-
req_file = os.path.join(os.path.dirname(__file__), 'requirements.txt')
14-
requirements = [i.strip() for i in open(req_file).readlines()]
15-
1610
setup_params = dict(
1711
name="sqlalchemy_monetdb",
18-
version=__version__,
12+
version='0.9.2',
1913
description="SQLAlchemy dialect for MonetDB",
2014
author="Gijs Molenaar",
2115
author_email="gijsmolenaar@gmail.com",
@@ -41,7 +35,7 @@
4135
["monetdb = sqlalchemy_monetdb.dialect:MonetDialect"]
4236
},
4337
license="MIT",
44-
install_requires=requirements
38+
install_requires=['pymonetdb <= 0.1', 'sqlalchemy'],
4539
)
4640

4741
if __name__ == '__main__':

sqlalchemy_monetdb/__init__.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,11 @@
22
SQLAlchemy backend for MonetDB
33
"""
44

5-
__version__ = '0.9.1'
5+
import pkg_resources
6+
7+
8+
try:
9+
__version__ = pkg_resources.require("sqlalchemy-monetdb")[0].version
10+
except pkg_resources.DistributionNotFound:
11+
__version__ = "dev"
12+

0 commit comments

Comments
 (0)