Merge pull request #9 from thombashi/develop

Develop
thombashi · Jul 17, 2016 · edd6129 · edd6129
2 parents ee4bda7 + 97080e7
commit edd6129
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 12 deletions.
diff --git 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/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/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
diff --git 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/sqlitebiter/__init__.py b/sqlitebiter/__init__.py
@@ -1 +1 @@
-VERSION = "0.1.3"
+VERSION = "0.1.4"
diff --git 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

diff --git 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 =