Skip to content
This repository has been archived by the owner on Jun 7, 2023. It is now read-only.

Commit

Permalink
Merge pull request #24 from lendingblock/master
Browse files Browse the repository at this point in the history
0.2.1
  • Loading branch information
lsbardel authored Nov 6, 2018
2 parents aacf058 + 0bef949 commit 7b7af8c
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 7 deletions.
15 changes: 14 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -49,9 +60,11 @@ workflows:
version: 2
build-deploy:
jobs:
- tests36
- tests
- deploy-release:
requires:
- tests36
- tests
filters:
branches:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
__pycache__
*.pyc
.pytest_cache
.python-version
*.egg-info
.coverage
coverage.xml
Expand Down
2 changes: 1 addition & 1 deletion agiletoolkit/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Agile toolkit for devops and repository management"""

__version__ = "0.2.0"
__version__ = "0.2.1"
2 changes: 1 addition & 1 deletion agiletoolkit/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def shi(command, cwd=None, echo=None, env=None):
def command():
try:
yield
except CommandError as exc:
except CommandError:
raise


Expand Down
4 changes: 1 addition & 3 deletions dev/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions readme.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
10 changes: 9 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import sys

from setuptools import setup, find_packages

Expand Down Expand Up @@ -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__,
Expand All @@ -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"
Expand Down

0 comments on commit 7b7af8c

Please sign in to comment.