Skip to content

Commit cd76745

Browse files
committed
Added the --version option and promoted to v1.1.0 final
1 parent b1ee180 commit cd76745

3 files changed

Lines changed: 16 additions & 3 deletions

File tree

setup.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33

44
from setuptools import setup, find_packages
55

6+
import sqlacodegen
7+
68

79
extra_requirements = ()
810
dependency_links = []
911
if sys.version_info < (2, 7):
1012
extra_requirements = ('argparse',)
1113
elif sys.version_info > (3,):
12-
dependency_links = ['https://github.com/benthor/inflect.py/archive/master.zip#egg=inflect-0.2.3']
14+
dependency_links = ['https://github.com/benthor/inflect.py/archive/master.zip#egg=inflect-0.2.4']
1315

1416
here = os.path.dirname(__file__)
1517
readme_path = os.path.join(here, 'README.rst')
@@ -19,7 +21,7 @@
1921
name='sqlacodegen',
2022
description='Automatic model code generator for SQLAlchemy',
2123
long_description=readme,
22-
version='1.1.0.pre3',
24+
version=sqlacodegen.version,
2325
author='Alex Gronholm',
2426
author_email='sqlacodegen@nextday.fi',
2527
url='http://pypi.python.org/pypi/sqlacodegen/',

sqlacodegen/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
version = '1.1.0'

sqlacodegen/main.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
from sqlalchemy.schema import MetaData
88

99
from sqlacodegen.codegen import CodeGenerator
10+
import sqlacodegen
1011

1112

1213
def main():
1314
parser = argparse.ArgumentParser(description='Generates SQLAlchemy model code from an existing database.')
14-
parser.add_argument('url', help='SQLAlchemy url to the database')
15+
parser.add_argument('url', nargs='?', help='SQLAlchemy url to the database')
16+
parser.add_argument('--version', action='store_true', help="print the version number and exit")
1517
parser.add_argument('--schema', help='load tables from an alternate schema')
1618
parser.add_argument('--tables', help='tables to process (comma-separated, default: all)')
1719
parser.add_argument('--noviews', action='store_true', help="ignore views")
@@ -23,6 +25,14 @@ def main():
2325
help='file to write output to (default: stdout)')
2426
args = parser.parse_args()
2527

28+
if args.version:
29+
print(sqlacodegen.version)
30+
return
31+
if not args.url:
32+
print('You must supply a url\n', file=sys.stderr)
33+
parser.print_help()
34+
return
35+
2636
engine = create_engine(args.url)
2737
metadata = MetaData(engine)
2838
tables = args.tables.split(',') if args.tables else None

0 commit comments

Comments
 (0)