From ee2162cbfb4f95b0fed32db8e8564db7aabb6a03 Mon Sep 17 00:00:00 2001
From: Timoteo <phillipstr@gmail.com>
Date: Sat, 26 Jan 2019 22:28:00 +0300
Subject: [PATCH] modifies package structure to be more in-line with the Poetry
 and the pyproject.toml guidelines

---
 .travis.yml          | 28 +++++++++++-------
 CHANGES.md           |  2 +-
 MANIFEST.in          |  6 ----
 requirements-dev.txt |  3 --
 requirements.txt     |  5 ----
 setup.cfg            |  5 ----
 setup.py             | 69 --------------------------------------------
 7 files changed, 18 insertions(+), 100 deletions(-)
 delete mode 100644 MANIFEST.in
 delete mode 100644 requirements-dev.txt
 delete mode 100644 requirements.txt
 delete mode 100644 setup.cfg
 delete mode 100644 setup.py

diff --git a/.travis.yml b/.travis.yml
index 802b2d3..8df7d4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,19 @@
+sudo: false
 language: python
-python:
-  - "3.5"
-  - "3.6"
-env:
-  global:
-    - PYTHONPATH="/home/travis/build/trp07/messages"
-install:
-  - pip install .
-  - pip install pytest-cov pytest-mock coveralls
-script: py.test --cov=messages
+python: 3.6
+
+cache: pip
+
+before_install: pip install poetry coveralls
+install: poetry install
+script: pytest --cov=messages
 after_success:
-- coveralls
+  - coveralls
+
+jobs:
+  include:
+    - python: 3.5
+    - python: 3.6
+    - python: 3.7
+      dist: xenial
+      sudo: required
diff --git a/CHANGES.md b/CHANGES.md
index 4ba692a..f54143b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,7 +3,7 @@ Change Log
 
 Upcoming
 --------
-- Add Poetry as the package installer/manager
+- Adds Poetry as the package installer/manager.
 - Improved and more robust exception handling to handle events like login failure, incorrect profile names, etc. in a more graceful manner.
 - Working to migrate documentation from the github wiki to readthedocs.
 
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index a29d1c5..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include LICENSE
-include CHANGES.md
-include requirements.txt
-include requirements-dev.txt
-
-recursive-include tests *.py
diff --git a/requirements-dev.txt b/requirements-dev.txt
deleted file mode 100644
index 35be090..0000000
--- a/requirements-dev.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-pytest-cov
-pytest-mock
-black
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index b362ef6..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-click>=6.0
-jsonconfig-tool
-requests
-validus>=0.3.0
-fbchat
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 4e666b4..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdist_wheel]
-universal = 0
-
-[aliases]
-test = pytest
diff --git a/setup.py b/setup.py
deleted file mode 100644
index dc8ded9..0000000
--- a/setup.py
+++ /dev/null
@@ -1,69 +0,0 @@
-import ast
-import re
-from setuptools import setup, find_packages
-
-
-# get __version__ from __init__.py
-_version_re = re.compile(r'__version__\s+=\s+(.*)')
-with open('messages/__init__.py', 'rb') as f:
-    version = str(ast.literal_eval(_version_re.search(
-        f.read().decode('utf-8')).group(1)))
-
-
-# load README.md
-with open('README.md', 'r', encoding='utf-8') as f:
-    readme = f.read()
-
-
-setup(
-    name='messages',
-    version=version,
-    url='https://github.com/trp07/messages',
-    keywords=['message', 'messages', 'wrapper', 'email', 'text', 'SMS', 'MMS',
-              'chat', 'chats', 'slack', 'twilio', 'async', 'asynchronous',
-              'telegram', 'bot', 'telegrambot', 'whatsapp', 'facebook'],
-
-    author='Tim Phillips',
-    author_email='phillipstr@gmail.com',
-
-    description=('A package designed to make sending messages '
-                 'easy and efficient!'),
-    long_description=readme,
-    long_description_content_type='text/markdown',
-
-    packages=find_packages(include=['messages']),
-    include_package_data=True,
-    zipsafe=False,
-
-    classifiers=[
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Topic :: Utilities',
-    ],
-
-    python_requires='>=3.5',
-
-    install_requires=[
-        'click>=6.0',
-        'requests',
-        'jsonconfig-tool',
-        'validus>=0.3.0',
-        'fbchat',
-    ],
-
-    test_suite='tests',
-    test_requires=[
-        'pytest-cov',
-        'pytest-mock',
-    ],
-
-    setup_requires=['pytest-runner'],
-
-    entry_points={
-        'console_scripts': ['messages=messages.cli:main']
-    },
-
-)