Skip to content

Commit

Permalink
Remove support for py27 and py34 and default to py37
Browse files Browse the repository at this point in the history
  • Loading branch information
nir0s committed Nov 20, 2020
1 parent 5a7596e commit ededefb
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 33 deletions.
32 changes: 10 additions & 22 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@ workflows:
version: 2
test:
jobs:
- test-3.7
- test-3.6
- test-3.5
- test-3.4
- test-2.7
- test-py3pylint
- test-py3pytype

jobs:
test-3.6: &test-template
test-3.7: &test-template
docker:
- image: circleci/python:3.6-jessie
- image: cimg/python:3.7
environment:
- TOX_ENV: py36
- TOX_ENV: py37
working_directory: ~/wryte
steps:
- checkout
Expand All @@ -40,37 +39,26 @@ jobs:
- .tox
key: v1-dependencies-{{ checksum "setup.py" }}-{{ checksum "dev-requirements.txt" }}

test-3.5:
<<: *test-template
docker:
- image: circleci/python:3.5-jessie
environment:
- TOX_ENV: py35

test-3.4:
test-3.6:
<<: *test-template
docker:
- image: circleci/python:3.4-jessie
- image: cimg/python:3.6
environment:
- TOX_ENV: py34
- TOX_ENV: py36

test-2.7:
test-3.5:
<<: *test-template
docker:
- image: circleci/python:2.7-jessie
- image: cimg/python:3.5
environment:
- TOX_ENV: py27
- TOX_ENV: py35

test-py3pylint:
<<: *test-template
environment:
- TOX_ENV: py3pylint
docker:
- image: circleci/python:3.6-jessie

test-py3pytype:
<<: *test-template
environment:
- TOX_ENV: py3pytype
docker:
- image: circleci/python:3.6-jessie
12 changes: 9 additions & 3 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
.[cli]
.[color]
numpy
pytest
pytest-cov
tox==3.20
pylint==2.6.0
pytype==2020.8.28
pytest==6.0.1
pytest-cov==2.10.1
mock==4.0.2
isort==5.5.1
pre-commit==2.7.1
black==20.8b1
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ def read(*parts):

setup(
name='wryte',
version="0.3.1",
version="1.0.0",
url='https://github.com/strigo/wryte',
author='nir0s',
author='strigo.io',
author_email='ops@strigo.io',
license='LICENSE',
platforms='All',
Expand All @@ -26,14 +26,13 @@ def read(*parts):
'color': ['colorama'],
'cli': ['click>=6.7'],
'elasticsearch': ['CMRESHandler'],
'logzio': ['logzio-python-handler']
'logzio': ['logzio-python-handler'],
},
classifiers=[
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Natural Language :: English',
'Environment :: Console',
'Intended Audience :: Developers',
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
minversion = 1.7.2
envlist = py3pylint, py27, py34, py35, py36
envlist = py3pylint, py3pytype, py35, py36, py37
skip_missing_interpreters = true

[testenv]
Expand All @@ -20,11 +20,11 @@ commands = pytest --cov-report term-missing --cov wryte tests -v
passenv = ProgramFiles APPVEYOR LOGNAME USER LNAME USERNAME HOME USERPROFILE

[testenv:py3pylint]
basepython = python3.6
basepython = python3.7
deps = pylint
commands = pylint wryte.py

[testenv:py3pytype]
basepython = python3.6
basepython = python3.7
deps = pytype
commands = pytype wryte.py

0 comments on commit ededefb

Please sign in to comment.