From 813e98a8013a732d22ec94a47bb449bc9da1ad48 Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Sun, 14 Jan 2018 22:57:23 -0600 Subject: [PATCH] improved project structuring --- .gitignore | 8 +++--- onionr.egg-info/PKG-INFO | 11 ++++++++ onionr.egg-info/SOURCES.txt | 9 ++++++ onionr.egg-info/dependency_links.txt | 1 + onionr.egg-info/entry_points.txt | 3 ++ onionr.egg-info/top_level.txt | 1 + onionr.egg-info/zip-safe | 1 + onionr/__init__.py | 1 + api.py => onionr/api.py | 0 colors.py => onionr/colors.py | 0 communicator.py => onionr/communicator.py | 0 core.py => onionr/core.py | 0 gui.py => onionr/gui.py | 0 onionr.py => onionr/onionr.py | 0 onionrutils.py => onionr/onionrutils.py | 0 tests.py => onionr/tests.py | 0 timedHmac.py => onionr/timedHmac.py | 0 requirements.txt | 6 ++++ setup.cfg | 3 ++ setup.py | 34 ++++++++++++++++------- 20 files changed, 64 insertions(+), 14 deletions(-) create mode 100644 onionr.egg-info/PKG-INFO create mode 100644 onionr.egg-info/SOURCES.txt create mode 100644 onionr.egg-info/dependency_links.txt create mode 100644 onionr.egg-info/entry_points.txt create mode 100644 onionr.egg-info/top_level.txt create mode 100644 onionr.egg-info/zip-safe create mode 100644 onionr/__init__.py rename api.py => onionr/api.py (100%) rename colors.py => onionr/colors.py (100%) rename communicator.py => onionr/communicator.py (100%) rename core.py => onionr/core.py (100%) rename gui.py => onionr/gui.py (100%) rename onionr.py => onionr/onionr.py (100%) rename onionrutils.py => onionr/onionrutils.py (100%) rename tests.py => onionr/tests.py (100%) rename timedHmac.py => onionr/timedHmac.py (100%) create mode 100644 requirements.txt create mode 100644 setup.cfg diff --git a/.gitignore b/.gitignore index 0e059a82..5d353fbc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ __pycache__/ -data/config.ini -data/*.db -data-old/* -dev-enabled +onionr/data/config.ini +onionr/data/*.db +onionr/data-old/* +onionr/dev-enabled diff --git a/onionr.egg-info/PKG-INFO b/onionr.egg-info/PKG-INFO new file mode 100644 index 00000000..0eab0634 --- /dev/null +++ b/onionr.egg-info/PKG-INFO @@ -0,0 +1,11 @@ +Metadata-Version: 1.0 +Name: onionr +Version: 0.0.0.dev0 +Summary: Decentralized P2P platform +Home-page: https://github.com/beardog108/onionr +Author: Kevin Froman +Author-email: beardog@firemail.cc +License: GPL 3.0 +Description-Content-Type: UNKNOWN +Description: UNKNOWN +Platform: UNKNOWN diff --git a/onionr.egg-info/SOURCES.txt b/onionr.egg-info/SOURCES.txt new file mode 100644 index 00000000..4d47489d --- /dev/null +++ b/onionr.egg-info/SOURCES.txt @@ -0,0 +1,9 @@ +setup.cfg +setup.py +onionr/__init__.py +onionr.egg-info/PKG-INFO +onionr.egg-info/SOURCES.txt +onionr.egg-info/dependency_links.txt +onionr.egg-info/entry_points.txt +onionr.egg-info/top_level.txt +onionr.egg-info/zip-safe \ No newline at end of file diff --git a/onionr.egg-info/dependency_links.txt b/onionr.egg-info/dependency_links.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/onionr.egg-info/dependency_links.txt @@ -0,0 +1 @@ + diff --git a/onionr.egg-info/entry_points.txt b/onionr.egg-info/entry_points.txt new file mode 100644 index 00000000..5d3e5f68 --- /dev/null +++ b/onionr.egg-info/entry_points.txt @@ -0,0 +1,3 @@ + + # -*- Entry points: -*- + \ No newline at end of file diff --git a/onionr.egg-info/top_level.txt b/onionr.egg-info/top_level.txt new file mode 100644 index 00000000..d352489f --- /dev/null +++ b/onionr.egg-info/top_level.txt @@ -0,0 +1 @@ +onionr diff --git a/onionr.egg-info/zip-safe b/onionr.egg-info/zip-safe new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/onionr.egg-info/zip-safe @@ -0,0 +1 @@ + diff --git a/onionr/__init__.py b/onionr/__init__.py new file mode 100644 index 00000000..792d6005 --- /dev/null +++ b/onionr/__init__.py @@ -0,0 +1 @@ +# diff --git a/api.py b/onionr/api.py similarity index 100% rename from api.py rename to onionr/api.py diff --git a/colors.py b/onionr/colors.py similarity index 100% rename from colors.py rename to onionr/colors.py diff --git a/communicator.py b/onionr/communicator.py similarity index 100% rename from communicator.py rename to onionr/communicator.py diff --git a/core.py b/onionr/core.py similarity index 100% rename from core.py rename to onionr/core.py diff --git a/gui.py b/onionr/gui.py similarity index 100% rename from gui.py rename to onionr/gui.py diff --git a/onionr.py b/onionr/onionr.py similarity index 100% rename from onionr.py rename to onionr/onionr.py diff --git a/onionrutils.py b/onionr/onionrutils.py similarity index 100% rename from onionrutils.py rename to onionr/onionrutils.py diff --git a/tests.py b/onionr/tests.py similarity index 100% rename from tests.py rename to onionr/tests.py diff --git a/timedHmac.py b/onionr/timedHmac.py similarity index 100% rename from timedHmac.py rename to onionr/timedHmac.py diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..9f754d3c --- /dev/null +++ b/requirements.txt @@ -0,0 +1,6 @@ +simple_crypt==4.1.7 +requests==2.18.4 +setuptools==38.2.4 +Flask==0.12.2 +pycrypto==2.6.1 +gnupg==2.3.1 diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..01bb9544 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,3 @@ +[egg_info] +tag_build = dev +tag_svn_revision = true diff --git a/setup.py b/setup.py index fb27358a..323d0ffb 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,26 @@ -#!/usr/bin/env python3 +from setuptools import setup, find_packages +import sys, os -from distutils.core import setup +version = '0.0.0' - setup(name='Onionr', - version='0.0.0', - description='P2P Microblogging Platform & Social network.', - author='Kevin Froman', - author_email='beardog@firemail.cc', - url='https://github.com/beardog108/onionr', - packages=['requests'], - ) \ No newline at end of file +setup(name='onionr', + version=version, + description="Decentralized P2P platform", + long_description="""\ +""", + classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers + keywords='', + author='Kevin Froman', + author_email='beardog@firemail.cc', + url='https://github.com/beardog108/onionr', + license='GPL 3.0', + packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), + include_package_data=True, + zip_safe=True, + install_requires=[ + # -*- Extra requirements: -*- + ], + entry_points=""" + # -*- Entry points: -*- + """, + )