move stuff into folders different

TojikCZ · Oct 30, 2019 · 90666aa · 90666aa
1 parent de0df3b
commit 90666aa
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 16 deletions.
diff --git a/ghia/__init__.py b/ghia/__init__.py
@@ -1,4 +1 @@
-from ghia_web import create_app
-import ghia_cmd as ghia
-
-__all__ = ['ghia']
+from ghia.ghia_web import create_app
diff --git a/ghia/__main__.py b/ghia/__main__.py
@@ -1,5 +1,5 @@
 import sys
-from ghia_cmd import ghia_cmd
+from ghia.ghia_cmd import ghia_cmd
 
 sys.argv[0] = "ghia"
 

diff --git a/ghia_web/flask_config.json → ghia/flask_config.json b/ghia_web/flask_config.json → ghia/flask_config.json
diff --git a/ghia_cmd/ghia_cmd.py → ghia/ghia_cmd.py b/ghia_cmd/ghia_cmd.py → ghia/ghia_cmd.py
@@ -1,10 +1,9 @@
 #!/bin/python
 import configparser
-
-import click
 import re
 
-from github_communicator import RequestException, GithubCommunicator
+import click
+from ghia.github_communicator import RequestException, GithubCommunicator
 
 
 class GHIASolver:

diff --git a/ghia_web/ghia_web.py → ghia/ghia_web.py b/ghia_web/ghia_web.py → ghia/ghia_web.py
@@ -8,7 +8,7 @@
 import hashlib
 import hmac
 
-from ghia_cmd import GHIASolver
+from ghia.ghia_cmd import GHIASolver
 
 REACT_TO = {"opened", "edited", "transferred", "reopened", "assigned", "unassigned", "labeled", "unlabeled"}
 

diff --git a/github_communicator/github_communicator.py → ghia/github_communicator.py b/github_communicator/github_communicator.py → ghia/github_communicator.py
diff --git a/ghia_web/static/style.css → ghia/static/style.css b/ghia_web/static/style.css → ghia/static/style.css
diff --git a/ghia_web/templates/homepage.html → ghia/templates/homepage.html b/ghia_web/templates/homepage.html → ghia/templates/homepage.html
diff --git a/ghia_cmd/__init__.py b/ghia_cmd/__init__.py
diff --git a/ghia_web/__init__.py b/ghia_web/__init__.py
diff --git a/github_communicator/__init__.py b/github_communicator/__init__.py
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='ghia_joziftom',
-    version='0.3.1',
+    version='0.3.2',
     description='Assigns people to issues based on config files',
     long_description=long_description,
     long_description_content_type="text/plain",
@@ -15,8 +15,8 @@
     license='GNU GPLv3',
     url='https://github.com/TojikCZ/ghia1',
     packages=setuptools.find_packages(),
-    package_dir={'ghia_web': 'ghia_web'},
-    package_data={'ghia_web': ['templates/*.html', 'static/*.*', 'flask_config.json']},
+    package_dir={'ghia': 'ghia'},
+    package_data={'ghia': ['templates/*.html', 'static/*.*', 'flask_config.json']},
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Environment :: Console',
@@ -32,7 +32,7 @@
         ],
     entry_points={
         'console_scripts': [
-            'ghia = ghia_cmd.ghia_cmd:ghia_cmd',
+            'ghia = ghia.ghia_cmd:ghia_cmd',
         ],
     },
     install_requires=['Flask', 'click', 'requests'],