From 8d67a1074f52dcb29d8df8aad1d3c4c6df04b572 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Hombashi Date: Sun, 17 Jul 2016 23:19:09 +0900 Subject: [PATCH 1/4] Update requirements --- requirements/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 98a9988..cd5d3b9 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,4 +1,4 @@ click -DataProperty>=0.5.4 +DataProperty>=0.7.2 path.py -SimpleSQLite>=0.4.1 +SimpleSQLite>=0.4.2 From 7f64a064107fa1f1b72d9b5c06e11dcda1b9e1c3 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Hombashi Date: Sun, 17 Jul 2016 23:20:21 +0900 Subject: [PATCH 2/4] Replace string formatter --- docs/make_readme.py | 4 ++-- sqlitebiter/sqlitebiter.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/make_readme.py b/docs/make_readme.py index c15b2cd..1e0a6dc 100644 --- a/docs/make_readme.py +++ b/docs/make_readme.py @@ -25,7 +25,7 @@ def write_examples(maker): maker.write_chapter("For more information") maker.write_line_list([ "More examples are available at ", - "http://%s.readthedocs.io/en/latest/pages/%s/index.html" % ( + "http://{:s}.readthedocs.io/en/latest/pages/{:s}/index.html".format( PROJECT_NAME.lower(), maker.examples_dir_name), ]) @@ -49,7 +49,7 @@ def main(): maker.set_indent_level(0) maker.write_chapter("Documentation") maker.write_line_list([ - "http://%s.readthedocs.org/en/latest/" % (PROJECT_NAME.lower()), + "http://{:s}.readthedocs.org/en/latest/".format(PROJECT_NAME.lower()), ]) return 0 diff --git a/sqlitebiter/sqlitebiter.py b/sqlitebiter/sqlitebiter.py index af048aa..cb1f615 100644 --- a/sqlitebiter/sqlitebiter.py +++ b/sqlitebiter/sqlitebiter.py @@ -94,7 +94,7 @@ def file(files, output_path): try: for tabledata in loader.load(): - click.echo("convert '%s' to '%s' table" % ( + click.echo("convert '{:s}' to '{:s}' table".format( file_path, tabledata.table_name)) con.create_table_from_tabledata(tabledata) convert_count += 1 @@ -127,8 +127,8 @@ def gs(credentials, title, output_path): loader.title = title for tabledata in loader.load(): - click.echo( - "convert '%s' to '%s' table" % (title, tabledata.table_name)) + click.echo("convert '{:s}' to '{:s}' table".format( + title, tabledata.table_name)) con.create_table_from_tabledata(tabledata) return 0 From 4201a9fb22d318efb7e83584bd75f944910b6f01 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Hombashi Date: Sun, 17 Jul 2016 23:21:46 +0900 Subject: [PATCH 3/4] Drop support for Python 2.6 --- .travis.yml | 2 -- setup.py | 1 - tox.ini | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 33a4aac..3f2e637 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: python matrix: include: - - python: 2.6 - env: TOXENV=python2.6 - python: 2.7 env: TOXENV=python2.7 - python: 3.3 diff --git a/setup.py b/setup.py index 045f82e..39b4fee 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,6 @@ "Operating System :: POSIX", "Operating System :: POSIX :: Linux", "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.3", diff --git a/tox.ini b/tox.ini index b931d5e..f45d082 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = python{2.6,2.7,3.3,3.4,3.5} +envlist = python{2.7,3.3,3.4,3.5} [testenv] deps = From 97080e7a06162ea994597a49ab7942d8ad610b92 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Hombashi Date: Sun, 17 Jul 2016 23:22:13 +0900 Subject: [PATCH 4/4] Bump version --- sqlitebiter/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqlitebiter/__init__.py b/sqlitebiter/__init__.py index 6d1f1c8..ab1bdd5 100644 --- a/sqlitebiter/__init__.py +++ b/sqlitebiter/__init__.py @@ -1 +1 @@ -VERSION = "0.1.3" +VERSION = "0.1.4"