From 5f101363cf68f7666d4f5b28f0887ee07e916054 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Sun, 28 Apr 2019 20:22:56 +0530 Subject: [PATCH] Pyhton 3.4 is EOL --- .circleci/config.yml | 6 ------ README.md | 2 +- buku | 12 ++---------- setup.py | 4 ++-- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e6191fc2..acb83585 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,11 +20,6 @@ test-template: &test-template python3 -m pytest ./tests/test_*.py --cov buku -vv --durations=0 jobs: - py34: - docker: - - image: python:3.4-slim - <<: *test-template - py35: docker: - image: python:3.5-slim @@ -63,7 +58,6 @@ workflows: test: jobs: &all-tests - - py34 - py35 - py36 - py37 diff --git a/README.md b/README.md index 1b125d42..1bccbd5f 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ There are several [projects based on `buku`](#related-projects), including a bro | Feature | Dependency | | --- | --- | -| Scripting language | Python 3.4+ | +| Scripting language | Python 3.5+ | | HTTPS | certifi, urllib3 | | Encryption | cryptography | | HTML | beautifulsoup4, html5lib | diff --git a/buku b/buku index d35f63a4..5f1217a5 100755 --- a/buku +++ b/buku @@ -2197,11 +2197,7 @@ class BukuDb: """ # Connect to input DB - if sys.version_info >= (3, 4, 4): - # Python 3.4.4 and above - conn = sqlite3.connect('file:%s?mode=ro' % path, uri=True) - else: - conn = sqlite3.connect(path) + conn = sqlite3.connect('file:%s?mode=ro' % path, uri=True) cur = conn.cursor() res = cur.execute('SELECT DISTINCT fk, parent, title FROM moz_bookmarks WHERE type=1') @@ -2454,11 +2450,7 @@ class BukuDb: try: # Connect to input DB - if sys.version_info >= (3, 4, 4): - # Python 3.4.4 and above - indb_conn = sqlite3.connect('file:%s?mode=ro' % path, uri=True) - else: - indb_conn = sqlite3.connect(path) + indb_conn = sqlite3.connect('file:%s?mode=ro' % path, uri=True) indb_cur = indb_conn.cursor() indb_cur.execute('SELECT * FROM bookmarks') diff --git a/setup.py b/setup.py index 0dc7e235..678dad36 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ author_email='engineerarun@gmail.com', url='https://github.com/jarun/Buku', license='GPLv3', - python_requires='>=3.4', # requires pip>=9.0.0 + python_requires='>=3.5', # requires pip>=9.0.0 platforms=['any'], py_modules=['buku'], install_requires=[ @@ -87,9 +87,9 @@ 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Topic :: Internet :: WWW/HTTP :: Indexing/Search', 'Topic :: Utilities' ]