Restructure project (#2)

* Restructure the project * Add very basic smoke check * Fix app launch
DaniruKun · Nov 29, 2019 · 00939a1 · 00939a1
1 parent 28667f1
commit 00939a1
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,7 @@
 language: python
 python:
-  - "3.6"      # current default Python on Travis CI
-# command to install dependencies
+  - "3.6"
 install:
   - pip install -r requirements.txt
-# command to run tests
-#script:
-#  - pytest
+script:
+  - python -m pytest
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-worker: python3 app.py
+worker: python3 -m main.py
diff --git a/main.py b/main.py
@@ -0,0 +1,3 @@
+from opencv_bot import app
+
+app.main()
diff --git a/opencv_bot/__init__.py b/opencv_bot/__init__.py
@@ -0,0 +1 @@
+from opencv_bot import app
diff --git a/app.py → opencv_bot/app.py b/app.py → opencv_bot/app.py
@@ -4,9 +4,9 @@
 import re
 import telegram
 from telegram.ext import Updater, CommandHandler, MessageHandler, Filters
-from utils.imgproc import (hsv, grey, red, green, blue, hue, sat, val,
-                           get_blur, get_sharp, norm, get_sobel, histeq,
-                           get_dft, get_rotated, get_threshold)
+from opencv_bot.utils.imgproc import (hsv, grey, red, green, blue, hue, sat, val,
+                                      get_blur, get_sharp, norm, get_sobel, histeq,
+                                      get_dft, get_rotated, get_threshold)
 
 # OpenCV bot auth token
 TOKEN = os.environ["TELEGRAM_TOKEN"]

diff --git a/setup.py → opencv_bot/setup.py b/setup.py → opencv_bot/setup.py
diff --git a/utils/__init__.py → opencv_bot/utils/__init__.py b/utils/__init__.py → opencv_bot/utils/__init__.py
diff --git a/utils/imgproc.py → opencv_bot/utils/imgproc.py b/utils/imgproc.py → opencv_bot/utils/imgproc.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,11 +1,21 @@
+attrs==19.3.0
 certifi==2019.9.11
 cffi==1.13.1
 cryptography==2.8
 future==0.18.2
 gunicorn==19.9.0
+importlib-metadata==0.23
+more-itertools==7.2.0
 numpy==1.17.3
 opencv-python-headless==3.4.6.27
+packaging==19.2
+pluggy==0.13.1
+py==1.8.0
 pycparser==2.19
+pyparsing==2.4.5
+pytest==5.3.1
 python-telegram-bot==12.2.0
 six==1.12.0
 tornado==6.0.3
+wcwidth==0.1.7
+zipp==0.6.0
diff --git a/__main__.py → test/__init__.py b/__main__.py → test/__init__.py
diff --git a/test/test_smoke.py b/test/test_smoke.py
@@ -0,0 +1,3 @@
+from opencv_bot import app
+
+assert 1 == 1