Skip to content

Commit

Permalink
Merge branch 'release/0.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
treethought committed Oct 11, 2019
2 parents 03703cf + 2211e08 commit 2c2680e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
1 change: 0 additions & 1 deletion .travis.yml
@@ -1,6 +1,5 @@
language: python
python:
- "2.7"
- "3.5"
- "3.6"
- "3.7-dev"
Expand Down
5 changes: 2 additions & 3 deletions Pipfile
Expand Up @@ -7,7 +7,6 @@ verify_ssl = true
pytest = "*"
pytest-cov = "*"
tox = "*"
black = "*"
flask-assistant = {editable = true,path = "."}

[packages]
Expand All @@ -18,12 +17,12 @@ click = "==7.0"
idna = "==2.8"
itsdangerous = "==1.1.0"
requests = "==2.21.0"
urllib3 = "==1.24.1"
urllib3 = "==1.24.2"
Flask = "==1.0.2"
Jinja2 = "==2.10"
MarkupSafe = "==1.1.0"
"ruamel.yaml" = "==0.15.81"
Werkzeug = "==0.14.1"
Werkzeug = "==0.15.3"
google-auth = "*"

[requires]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -2,7 +2,7 @@ Create Virtual Assistants with Python
=====================================

[![image](https://img.shields.io/pypi/v/flask-assistant.svg)](https://pypi.python.org/pypi/flask-assistant)
[![image](https://travis-ci.org/treethought/flask-assistant.svg?branch=master)](https://travis-ci.org/treethought/flask-assistant) ![image](https://img.shields.io/badge/python-2.7,%203.5,%203.6,%203.7-blue.svg) [![image](https://img.shields.io/badge/discord-join%20chat-green.svg)](https://discord.gg/m6YHGyJ)
[![image](https://travis-ci.org/treethought/flask-assistant.svg?branch=master)](https://travis-ci.org/treethought/flask-assistant) ![image](https://img.shields.io/badge/%203.5,%203.6,%203.7-blue.svg) [![image](https://img.shields.io/badge/discord-join%20chat-green.svg)](https://discord.gg/m6YHGyJ)

A flask extension serving as a framework to easily create virtual assistants using [Dialogflow](https://dialogflow.com/docs) which may be integrated
with platforms such as [Actions on
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Expand Up @@ -15,5 +15,5 @@ requests==2.21.0
rsa==4.0
ruamel.yaml==0.15.81
six==1.12.0
urllib3==1.24.1
werkzeug==0.14.1
urllib3==1.24.2
werkzeug==0.15.3
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -11,7 +11,7 @@

setup(
name="Flask-Assistant",
version="0.4.0",
version="0.4.1",
url="https://github.com/treethought/flask-assistant",
license="Apache 2.0",
author="Cam Sweeney",
Expand Down

0 comments on commit 2c2680e

Please sign in to comment.