Pyhton 3.4 is EOL

This commit is contained in:
Arun Prakash Jana 2019-04-28 20:22:56 +05:30
parent b864bc9219
commit 5f101363cf
4 changed files with 5 additions and 19 deletions

View File

@ -20,11 +20,6 @@ test-template: &test-template
python3 -m pytest ./tests/test_*.py --cov buku -vv --durations=0 python3 -m pytest ./tests/test_*.py --cov buku -vv --durations=0
jobs: jobs:
py34:
docker:
- image: python:3.4-slim
<<: *test-template
py35: py35:
docker: docker:
- image: python:3.5-slim - image: python:3.5-slim
@ -63,7 +58,6 @@ workflows:
test: test:
jobs: &all-tests jobs: &all-tests
- py34
- py35 - py35
- py36 - py36
- py37 - py37

View File

@ -87,7 +87,7 @@ There are several [projects based on `buku`](#related-projects), including a bro
| Feature | Dependency | | Feature | Dependency |
| --- | --- | | --- | --- |
| Scripting language | Python 3.4+ | | Scripting language | Python 3.5+ |
| HTTPS | certifi, urllib3 | | HTTPS | certifi, urllib3 |
| Encryption | cryptography | | Encryption | cryptography |
| HTML | beautifulsoup4, html5lib | | HTML | beautifulsoup4, html5lib |

8
buku
View File

@ -2197,11 +2197,7 @@ class BukuDb:
""" """
# Connect to input DB # 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) conn = sqlite3.connect('file:%s?mode=ro' % path, uri=True)
else:
conn = sqlite3.connect(path)
cur = conn.cursor() cur = conn.cursor()
res = cur.execute('SELECT DISTINCT fk, parent, title FROM moz_bookmarks WHERE type=1') res = cur.execute('SELECT DISTINCT fk, parent, title FROM moz_bookmarks WHERE type=1')
@ -2454,11 +2450,7 @@ class BukuDb:
try: try:
# Connect to input DB # 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) indb_conn = sqlite3.connect('file:%s?mode=ro' % path, uri=True)
else:
indb_conn = sqlite3.connect(path)
indb_cur = indb_conn.cursor() indb_cur = indb_conn.cursor()
indb_cur.execute('SELECT * FROM bookmarks') indb_cur.execute('SELECT * FROM bookmarks')

View File

@ -54,7 +54,7 @@ setup(
author_email='engineerarun@gmail.com', author_email='engineerarun@gmail.com',
url='https://github.com/jarun/Buku', url='https://github.com/jarun/Buku',
license='GPLv3', license='GPLv3',
python_requires='>=3.4', # requires pip>=9.0.0 python_requires='>=3.5', # requires pip>=9.0.0
platforms=['any'], platforms=['any'],
py_modules=['buku'], py_modules=['buku'],
install_requires=[ install_requires=[
@ -87,9 +87,9 @@ setup(
'Operating System :: OS Independent', 'Operating System :: OS Independent',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Topic :: Internet :: WWW/HTTP :: Indexing/Search', 'Topic :: Internet :: WWW/HTTP :: Indexing/Search',
'Topic :: Utilities' 'Topic :: Utilities'
] ]