Merge pull request #22 from rveachkc/develop

v0.1.6 - CI automation

.circleci/config.yml

@@ -75,10 +75,29 @@ jobs:
       - run: 
           name: make a source distribution
           command: |
+            . venv/bin/activate
             python setup.py sdist
 
       - run:
           name: upload to pypi
           command: |
             . venv/bin/activate
-            twine upload dist/*
+            twine upload --config-file ~/.pypirc dist/*
+
+workflows:
+  version: 2
+  build_and_deploy:
+    jobs:
+      - build:
+          filters:
+            tags:
+              only: /.*/
+      - deploy:
+          context: PYPI
+          requires:
+            - build
+          filters:
+            tags:
+              only: /[0-9]+(\.[0-9]+)*/
+            branches:
+              only: master

requirements.txt

@@ -1 +1,2 @@
-twine>=1.12.1
+m2r>=0.2.1
+twine>=1.12.1

setup.py

@@ -3,15 +3,18 @@
 import os
 import sys
 
+from m2r import parse_from_file
 from setuptools import setup
 from setuptools.command.install import install
 
-VERSION = "0.1.5"
+VERSION = "0.1.6"
 
 def readme():
     """ print long description """
-    with open('README.md') as f:
-        return r.read()
+    return parse_from_file('README.md')
+    #return pypandoc.convert('README.md', 'rst')
+    #with open('README.md') as f:
+    #    return f.read()
 
 class VerifyVersionCommand(install):
     """Custom command to verify that the git tag matches our version"""
@@ -54,7 +57,7 @@ def run(self):
     keywords=['Microsoft', 'Teams'],
     packages=['pymsteams'],
     install_requires=[
-        'requests==2.18.4',
+        'requests==2.20.0',
     ],
     python_requires='>=3',
     cmdclass={