Merge pull request #9 from iotaledger/develop

1.0.0b4

Author: todofixthis

.gitignore

@@ -1,22 +1,21 @@
-# Python metadata
+# Python bytecode.
 *.py[co]
 
 # Generated distribution files.
 # :see: https://packaging.python.org/distributing/
+PyOTA.egg-info/*
 build/*
 dist/*
-PyOTA.egg-info/*
-*.so
+
+# Created by ``setup.py test``.
+.eggs/*
 
 # Virtualenvs for unit tests.
-# :see: https://tox.readthedocs.io/en/latest/
+# https://tox.readthedocs.io/en/latest/
 .tox/*
 
-# Generated documentation files.
-docs/_build
-
 #
 # Note:  For environment- or IDE-specific metadata (e.g., .DS_Store, .idea, etc.
-#   you can add these to your own "global" .gitignore file.
-# :see: https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
+# you can add these to your own "global" .gitignore file.
+# https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
 #

MANIFEST.in

@@ -0,0 +1,3 @@
+include LICENSE
+recursive-include examples *.py
+recursive-include test *.py

docs/Makefile

@@ -0,0 +1 @@
+src/iota

docs/conf.py

@@ -17,17 +17,6 @@
 if (version_info[0] == 3) and (version_info[1] < 5):
   raise EnvironmentError('PyOTA requires Python 3.5 or greater.')
 
-##
-# Determine dependencies, depending on Python version.
-dependencies = [
-    'filters',
-    'requests',
-    'six',
-  ]
-
-if version_info[0:2] < (3, 5):
-  dependencies.append('typing')
-
 ##
 # Load long description for PyPi.
 with open('README.rst', 'r', 'utf-8') as f: # type: StreamReader
@@ -39,14 +28,19 @@
   name        = 'PyOTA',
   description = 'IOTA API library for Python',
   url         = 'https://github.com/iotaledger/iota.lib.py',
-  version     = '1.0.0b3',
+  version     = '1.0.0b4',
 
-  packages      = ['iota'] + ['iota.'+pkg for pkg in find_packages('iota')],
-  package_data  = {'': ['LICENSE']},
+  packages              = find_packages('src'),
+  include_package_data  = True,
 
   long_description = long_description,
 
-  install_requires = dependencies,
+  install_requires = [
+    'filters',
+    'requests',
+    'six',
+    'typing',
+  ],
 
   test_suite    = 'test',
   test_loader   = 'nose.loader:TestLoader',