Skip to content

Commit

Permalink
Pyhton 3.4 is EOL
Browse files Browse the repository at this point in the history
  • Loading branch information
jarun committed Apr 28, 2019
1 parent b864bc9 commit 5f10136
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 19 deletions.
6 changes: 0 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -63,7 +58,6 @@ workflows:

test:
jobs: &all-tests
- py34
- py35
- py36
- py37
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
12 changes: 2 additions & 10 deletions buku
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
author_email='[email protected]',
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=[
Expand Down Expand Up @@ -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'
]
Expand Down

0 comments on commit 5f10136

Please sign in to comment.