From 8730cd0954db8ae64b0f88a210da15b63f8d1735 Mon Sep 17 00:00:00 2001 From: Luca Sbardella Date: Tue, 6 Nov 2018 12:29:28 +0000 Subject: [PATCH 1/2] minor fixes --- .gitignore | 1 + agiletoolkit/__init__.py | 2 +- dev/requirements.txt | 4 +--- readme.md | 1 + setup.py | 10 +++++++++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d7b0b69..d65d4af 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ __pycache__ *.pyc .pytest_cache +.python-version *.egg-info .coverage coverage.xml diff --git a/agiletoolkit/__init__.py b/agiletoolkit/__init__.py index 962d8fa..5883f5f 100644 --- a/agiletoolkit/__init__.py +++ b/agiletoolkit/__init__.py @@ -1,3 +1,3 @@ """Agile toolkit for devops and repository management""" -__version__ = "0.2.0" +__version__ = "0.2.1" diff --git a/dev/requirements.txt b/dev/requirements.txt index 40906ea..25bc5c8 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -6,9 +6,7 @@ pyyaml requests jinja2 # -# required for python 3.6 -dataclasses # slack slackclient # -aio-kong>=0.2.1 +aio-kong>=0.3.3 diff --git a/readme.md b/readme.md index d03c498..dd98c94 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,7 @@ # Agile toolkit [![PyPI version](https://badge.fury.io/py/agile-toolkit.svg)](https://badge.fury.io/py/agile-toolkit) +[![Python versions](https://img.shields.io/pypi/pyversions/agile-toolkit.svg)](https://pypi.org/project/agile-toolkit) [![CircleCI](https://circleci.com/gh/lendingblock/agile-toolkit.svg?style=svg)](https://circleci.com/gh/lendingblock/agile-toolkit) diff --git a/setup.py b/setup.py index 70cf58d..08bb919 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ import os +import sys from setuptools import setup, find_packages @@ -29,6 +30,13 @@ def requirements(name): return install_requires, dependency_links +install_requires = requirements('dev/requirements.txt')[0] + + +if sys.version_info < (3, 7): + install_requires.append('dataclasses') + + meta = dict( version=pkg.__version__, description=pkg.__doc__, @@ -42,7 +50,7 @@ def requirements(name): packages=find_packages(exclude=['tests', 'tests.*']), include_package_data=True, zip_safe=False, - install_requires=requirements('dev/requirements.txt')[0], + install_requires=install_requires, entry_points={ "console_scripts": [ "agilekit=agiletoolkit.commands:start" From db3adcaccf2879f17a76fd20a79f6e159867ca93 Mon Sep 17 00:00:00 2001 From: Luca Sbardella Date: Tue, 6 Nov 2018 12:33:17 +0000 Subject: [PATCH 2/2] flake8 --- .circleci/config.yml | 15 ++++++++++++++- agiletoolkit/utils.py | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 94e3cfc..ed6134d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,19 @@ version: 2 jobs: - tests: + tests36: docker: - image: circleci/python:3.6 + steps: + - checkout + - run: + name: install + command: sudo python setup.py install && sudo ./dev/install-dev.sh + - run: + name: test + command: pytest + tests: + docker: + - image: circleci/python:3.7 steps: - checkout - run: @@ -49,9 +60,11 @@ workflows: version: 2 build-deploy: jobs: + - tests36 - tests - deploy-release: requires: + - tests36 - tests filters: branches: diff --git a/agiletoolkit/utils.py b/agiletoolkit/utils.py index d2d64aa..c20eb56 100644 --- a/agiletoolkit/utils.py +++ b/agiletoolkit/utils.py @@ -82,7 +82,7 @@ def shi(command, cwd=None, echo=None, env=None): def command(): try: yield - except CommandError as exc: + except CommandError: raise