Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump minimum Python version to 3.6 #562

Merged
merged 3 commits into from
Nov 22, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@ os: linux

jobs:
include:
- python: '3.7'
name: "flake8"
env: TOXENV="flake8"

- python: '3.5'
env: TOXENV="check_keys,py35-test,py35-integration"

- python: '3.6'
env:
- SO_BUCKET: smart-open
Expand All @@ -27,11 +20,16 @@ jobs:
- BOTO_CONFIG: "/dev/null"
- SO_ENABLE_MOTO_SERVER: "1"
- TOXENV: "check_keys,py37-doctest,enable_moto_server,py37-test,py37-benchmark,py37-integration,disable_moto_server"

- python: '3.8'
env:
- BOTO_CONFIG: "/dev/null"
- TOXENV: "check_keys,py38-doctest,test_coverage,py38-integration"

- python: '3.8'
name: "flake8"
env: TOXENV="flake8"

install:
- pip install tox

Expand Down
1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ environment:
TOX_PARALLEL_NO_SPINNER: 1

matrix:
- TOXENV: "check_keys,py35-test"
- TOXENV: "check_keys,py36-test"
- TOXENV: "check_keys,py37-test"
- TOXENV: "check_keys,py38-test"
Expand Down
9 changes: 6 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ def read(fname):
aws_deps = ['boto3']
gcp_deps = ['google-cloud-storage']
azure_deps = ['azure-storage-blob', 'azure-common', 'azure-core']
http_deps = ['requests']

all_deps = install_requires + aws_deps + gcp_deps + azure_deps
all_deps = install_requires + aws_deps + gcp_deps + azure_deps + http_deps

setup(
name='smart_open',
Expand Down Expand Up @@ -90,8 +91,10 @@ def read(fname):
'gcp': gcp_deps,
'azure': azure_deps,
'all': all_deps,
'http': http_deps,
'webhdfs': http_deps,
},
python_requires=">=3.5.*",
python_requires=">=3.6.*",

test_suite="smart_open.tests",

Expand All @@ -101,9 +104,9 @@ def read(fname):
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Topic :: System :: Distributed Computing',
'Topic :: Database :: Front-Ends',
],
Expand Down
5 changes: 4 additions & 1 deletion smart_open/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
import os.path
import urllib.parse

import requests
try:
import requests
except ImportError:
MISSING_DEPS = True

from smart_open import bytebuffer, constants
import smart_open.utils
Expand Down
5 changes: 4 additions & 1 deletion smart_open/webhdfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
import logging
import urllib.parse

import requests
try:
import requests
except ImportError:
MISSING_DEPS = True

from smart_open import utils, constants

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
minversion = 2.0
envlist = py{35,36,37,38}-{test,doctest,integration,benchmark}, sdist, flake8
envlist = py{36,37,38}-{test,doctest,integration,benchmark}, sdist, flake8

[pytest]
addopts = -rfxEXs --durations=20 --showlocals
Expand Down