Merge pull request #9 from iotaledger/develop

1.0.0b4
iotaledger · Jan 5, 2017 · 9828d48 · 9828d48
2 parents 4bc19d8 + 161c0f0
commit 9828d48
Show file tree

Hide file tree

Showing 50 changed files with 21 additions and 268 deletions.
diff --git a/.gitignore b/.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
 #
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,3 @@
+include LICENSE
+recursive-include examples *.py
+recursive-include test *.py
diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/conf.py b/docs/conf.py
diff --git a/docs/index.rst b/docs/index.rst
diff --git a/docs/make.bat b/docs/make.bat
diff --git a/examples/__init__.py b/examples/__init__.py
diff --git a/iota b/iota
@@ -0,0 +1 @@
+src/iota
diff --git a/setup.py b/setup.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',

diff --git a/iota/__init__.py → src/iota/__init__.py b/iota/__init__.py → src/iota/__init__.py
diff --git a/iota/adapter.py → src/iota/adapter.py b/iota/adapter.py → src/iota/adapter.py
diff --git a/iota/api.py → src/iota/api.py b/iota/api.py → src/iota/api.py
diff --git a/iota/codecs.py → src/iota/codecs.py b/iota/codecs.py → src/iota/codecs.py
diff --git a/iota/commands/__init__.py → src/iota/commands/__init__.py b/iota/commands/__init__.py → src/iota/commands/__init__.py
diff --git a/iota/commands/core/__init__.py → src/iota/commands/core/__init__.py b/iota/commands/core/__init__.py → src/iota/commands/core/__init__.py
diff --git a/iota/commands/core/add_neighbors.py → src/iota/commands/core/add_neighbors.py b/iota/commands/core/add_neighbors.py → src/iota/commands/core/add_neighbors.py
diff --git a/iota/commands/core/attach_to_tangle.py → src/iota/commands/core/attach_to_tangle.py b/iota/commands/core/attach_to_tangle.py → src/iota/commands/core/attach_to_tangle.py
diff --git a/iota/commands/core/broadcast_transactions.py → ...a/commands/core/broadcast_transactions.py b/iota/commands/core/broadcast_transactions.py → ...a/commands/core/broadcast_transactions.py
diff --git a/iota/commands/core/find_transactions.py → src/iota/commands/core/find_transactions.py b/iota/commands/core/find_transactions.py → src/iota/commands/core/find_transactions.py
diff --git a/iota/commands/core/get_balances.py → src/iota/commands/core/get_balances.py b/iota/commands/core/get_balances.py → src/iota/commands/core/get_balances.py
diff --git a/iota/commands/core/get_inclusion_states.py → ...ota/commands/core/get_inclusion_states.py b/iota/commands/core/get_inclusion_states.py → ...ota/commands/core/get_inclusion_states.py
diff --git a/iota/commands/core/get_neighbors.py → src/iota/commands/core/get_neighbors.py b/iota/commands/core/get_neighbors.py → src/iota/commands/core/get_neighbors.py
diff --git a/iota/commands/core/get_node_info.py → src/iota/commands/core/get_node_info.py b/iota/commands/core/get_node_info.py → src/iota/commands/core/get_node_info.py
diff --git a/iota/commands/core/get_tips.py → src/iota/commands/core/get_tips.py b/iota/commands/core/get_tips.py → src/iota/commands/core/get_tips.py
diff --git a/...mands/core/get_transactions_to_approve.py → ...mands/core/get_transactions_to_approve.py b/...mands/core/get_transactions_to_approve.py → ...mands/core/get_transactions_to_approve.py
diff --git a/iota/commands/core/get_trytes.py → src/iota/commands/core/get_trytes.py b/iota/commands/core/get_trytes.py → src/iota/commands/core/get_trytes.py
diff --git a/...nds/core/interrupt_attaching_to_tangle.py → ...nds/core/interrupt_attaching_to_tangle.py b/...nds/core/interrupt_attaching_to_tangle.py → ...nds/core/interrupt_attaching_to_tangle.py
diff --git a/iota/commands/core/remove_neighbors.py → src/iota/commands/core/remove_neighbors.py b/iota/commands/core/remove_neighbors.py → src/iota/commands/core/remove_neighbors.py
diff --git a/iota/commands/core/store_transactions.py → src/iota/commands/core/store_transactions.py b/iota/commands/core/store_transactions.py → src/iota/commands/core/store_transactions.py
diff --git a/iota/commands/extended/__init__.py → src/iota/commands/extended/__init__.py b/iota/commands/extended/__init__.py → src/iota/commands/extended/__init__.py
diff --git a/.../commands/extended/broadcast_and_store.py → .../commands/extended/broadcast_and_store.py b/.../commands/extended/broadcast_and_store.py → .../commands/extended/broadcast_and_store.py
diff --git a/iota/commands/extended/get_bundles.py → src/iota/commands/extended/get_bundles.py b/iota/commands/extended/get_bundles.py → src/iota/commands/extended/get_bundles.py
diff --git a/iota/commands/extended/get_inputs.py → src/iota/commands/extended/get_inputs.py b/iota/commands/extended/get_inputs.py → src/iota/commands/extended/get_inputs.py
diff --git a/...commands/extended/get_latest_inclusion.py → ...commands/extended/get_latest_inclusion.py b/...commands/extended/get_latest_inclusion.py → ...commands/extended/get_latest_inclusion.py
diff --git a/iota/commands/extended/get_new_addresses.py → ...ta/commands/extended/get_new_addresses.py b/iota/commands/extended/get_new_addresses.py → ...ta/commands/extended/get_new_addresses.py
diff --git a/iota/commands/extended/get_transfers.py → src/iota/commands/extended/get_transfers.py b/iota/commands/extended/get_transfers.py → src/iota/commands/extended/get_transfers.py
diff --git a/iota/commands/extended/prepare_transfer.py → ...ota/commands/extended/prepare_transfer.py b/iota/commands/extended/prepare_transfer.py → ...ota/commands/extended/prepare_transfer.py
diff --git a/iota/commands/extended/replay_bundle.py → src/iota/commands/extended/replay_bundle.py b/iota/commands/extended/replay_bundle.py → src/iota/commands/extended/replay_bundle.py
diff --git a/iota/commands/extended/send_transfer.py → src/iota/commands/extended/send_transfer.py b/iota/commands/extended/send_transfer.py → src/iota/commands/extended/send_transfer.py
diff --git a/iota/commands/extended/send_trytes.py → src/iota/commands/extended/send_trytes.py b/iota/commands/extended/send_trytes.py → src/iota/commands/extended/send_trytes.py
diff --git a/iota/crypto/__init__.py → src/iota/crypto/__init__.py b/iota/crypto/__init__.py → src/iota/crypto/__init__.py
diff --git a/iota/crypto/addresses.py → src/iota/crypto/addresses.py b/iota/crypto/addresses.py → src/iota/crypto/addresses.py
diff --git a/iota/crypto/pycurl.py → src/iota/crypto/pycurl.py b/iota/crypto/pycurl.py → src/iota/crypto/pycurl.py
diff --git a/iota/crypto/signing.py → src/iota/crypto/signing.py b/iota/crypto/signing.py → src/iota/crypto/signing.py
diff --git a/iota/crypto/types.py → src/iota/crypto/types.py b/iota/crypto/types.py → src/iota/crypto/types.py
diff --git a/iota/exceptions.py → src/iota/exceptions.py b/iota/exceptions.py → src/iota/exceptions.py
diff --git a/iota/filters.py → src/iota/filters.py b/iota/filters.py → src/iota/filters.py
diff --git a/iota/json.py → src/iota/json.py b/iota/json.py → src/iota/json.py
diff --git a/iota/transaction.py → src/iota/transaction.py b/iota/transaction.py → src/iota/transaction.py
diff --git a/iota/types.py → src/iota/types.py b/iota/types.py → src/iota/types.py