all: Fix package import

Author: Eric Gourlaouen

.travis.yml

@@ -17,8 +17,8 @@ before_script:
   - docker run -d -p 127.0.0.1:1883:1883 thethingsnetwork/rabbitmq
 
 script:
-  - pycodestyle --first ttn
-  - pycodestyle --first utils
+  - pycodestyle --first ttn/*.py
+  - pycodestyle --first ttn/utils
   - pytest test_*.py
 
 before_deploy:

mock.py

@@ -4,9 +4,8 @@
 # MIT license that can be found in the LICENSE file.
 
 
-import github_com.TheThingsNetwork.api.handler.handler_pb2 as proto
-import github_com.TheThingsNetwork.api.protocol.lorawan.device_pb2 as lorawan
-import github_com.TheThingsNetwork.api.handler.handler_pb2_grpc as handler
+
+import ttn.github_com.TheThingsNetwork.api.handler.handler_pb2 as proto
 
 
 class MockApplicationManager:

setup.py

@@ -3,26 +3,27 @@
 # Use of this source code is governed by the
 # MIT license that can be found in the LICENSE file.
 
-from setuptools import setup
+from setuptools import find_packages, setup
 
 import io
 
 with io.open("README.rst", encoding="utf-8") as f:
     long_description = f.read()
 
 setup(name="ttn",
-      version="2.1.0",
+      version="2.1.1",
       description="The Things Network Client",
       long_description = long_description,
       url = "https://github.com/TheThingsNetwork/python-app-sdk",
       author="Emmanuelle Lejeail",
       author_email="[email protected]",
       license="MIT",
-      packages=["ttn", "github_com", "utils"],
+      packages=find_packages(),
       install_requires=[
           "paho-mqtt",
           "events",
           "grpcio",
+          "python-jose",
           # packages which need to be imported to make gRPC work
           "protobuf",
           "google-api-python-client",

test_application.py

@@ -7,9 +7,8 @@
 import unittest
 from mock import MockApplicationManager
 from ttn import ApplicationClient
-import github_com.TheThingsNetwork.api.handler.handler_pb2 as handler
-import github_com.TheThingsNetwork.api.protocol.lorawan.device_pb2 as lorawan
-from utils import stubs
+import ttn.github_com.TheThingsNetwork.api.handler.handler_pb2 as handler
+from ttn.utils import stubs
 import binascii
 
 

test_discovery.py

@@ -5,7 +5,6 @@
 
 import unittest
 from ttn import DiscoveryClient
-from utils import stubs
 
 class TestDiscoveryClient(unittest.TestCase):
 

test_handler.py

@@ -6,8 +6,7 @@
 
 import unittest
 import ttn
-import time
-from utils import stubs
+from ttn.utils import stubs
 
 class TestHandlerClient(unittest.TestCase):
 

test_ttnmqtt.py

@@ -4,11 +4,10 @@
 # MIT license that can be found in the LICENSE file.
 
 import unittest
-import os
 import time
 import json
 from ttn import MQTTClient as mqtt
-from utils import stubs
+from ttn.utils import stubs
 
 MQTT_ADDR = "localhost:1883"
 

ttn/application.py

@@ -7,15 +7,15 @@
 import grpc
 import os
 import base64
-import json
-import github_com.TheThingsNetwork.api.handler.handler_pb2 as proto
-import github_com.TheThingsNetwork.api.protocol.lorawan.device_pb2 as lorawan
-import github_com.TheThingsNetwork.api.handler.handler_pb2_grpc as handler
 
 
-from jose import jwt
+import ttn.github_com.TheThingsNetwork.api.handler.handler_pb2 as proto
+import ttn.github_com.TheThingsNetwork.api.protocol.lorawan.device_pb2 \
+    as lorawan
+import ttn.github_com.TheThingsNetwork.api.handler.handler_pb2_grpc as handler
+from ttn.utils import stubs
+
 from .discovery import DiscoveryClient
-from utils import read_key, stubs
 
 
 if os.getenv("GRPC_SSL_CIPHER_SUITES"):
@@ -38,13 +38,13 @@ def __init__(self, app_id, access_key,
 
         if not net_address:
             discovery = DiscoveryClient(discovery_address)
-            announcement = discovery.get_by_app_id(self.app_id)
+            announcement = discovery.get_by_app_id(self.app_id.encode())
             net_address = announcement.net_address
             cert_content = announcement.certificate
         elif not cert_content:
             raise RuntimeError("You need to provide credentials")
 
-        creds = grpc.ssl_channel_credentials(cert_content)
+        creds = grpc.ssl_channel_credentials(cert_content.encode())
         channel = grpc.secure_channel(net_address, creds)
         self.client = handler.ApplicationManagerStub(channel)
 
@@ -53,7 +53,7 @@ def __create_metadata(self):
 
     def get(self):
         req = proto.ApplicationIdentifier()
-        req.app_id = self.app_id
+        req.app_id = self.app_id.encode()
         meta = self.__create_metadata()
         try:
             app = self.client.GetApplication(req, TIME_OUT, meta)

ttn/discovery.py

@@ -4,12 +4,13 @@
 # MIT license that can be found in the LICENSE file.
 
 
-import github_com.TheThingsNetwork.api.discovery.discovery_pb2_grpc as disco
-import github_com.TheThingsNetwork.api.discovery.discovery_pb2 as proto
+import ttn.github_com.TheThingsNetwork.api.discovery.discovery_pb2_grpc \
+    as disco
+import ttn.github_com.TheThingsNetwork.api.discovery.discovery_pb2 as proto
 
 import grpc
 import os
-from utils import stubs
+from ttn.utils import stubs
 
 if os.getenv("GRPC_SSL_CIPHER_SUITES"):
     os.environ["GRPC_SSL_CIPHER_SUITES"] += os.pathsep + stubs.MODERN_CIPHER

github_com/TheThingsNetwork/__init__.py renamed to ttn/github_com/TheThingsNetwork/__init__.py

@@ -1,7 +1,7 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-from github_com.TheThingsNetwork.api.broker import broker_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_broker_dot_broker__pb2
+from ttn.github_com.TheThingsNetwork.api.broker import broker_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_broker_dot_broker__pb2
 from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
 
 

github_com/TheThingsNetwork/api/__init__.py renamed to ttn/github_com/TheThingsNetwork/api/__init__.py

@@ -1,7 +1,7 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-from github_com.TheThingsNetwork.api.discovery import discovery_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_discovery_dot_discovery__pb2
+from ttn.github_com.TheThingsNetwork.api.discovery import discovery_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_discovery_dot_discovery__pb2
 from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
 
 

github_com/TheThingsNetwork/api/api_pb2.py renamed to ttn/github_com/TheThingsNetwork/api/api_pb2.py

@@ -1,8 +1,8 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-from github_com.TheThingsNetwork.api.broker import broker_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_broker_dot_broker__pb2
-from github_com.TheThingsNetwork.api.handler import handler_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_handler_dot_handler__pb2
+from ttn.github_com.TheThingsNetwork.api.broker import broker_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_broker_dot_broker__pb2
+from ttn.github_com.TheThingsNetwork.api.handler import handler_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_handler_dot_handler__pb2
 from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
 
 

github_com/TheThingsNetwork/api/api_pb2_grpc.py renamed to ttn/github_com/TheThingsNetwork/api/api_pb2_grpc.py

@@ -1,11 +1,11 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-from github_com.TheThingsNetwork.api.broker import broker_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_broker_dot_broker__pb2
-from github_com.TheThingsNetwork.api.gateway import gateway_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_gateway_dot_gateway__pb2
-from github_com.TheThingsNetwork.api.handler import handler_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_handler_dot_handler__pb2
-from github_com.TheThingsNetwork.api.networkserver import networkserver_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_networkserver_dot_networkserver__pb2
-from github_com.TheThingsNetwork.api.router import router_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_router_dot_router__pb2
+from ttn.github_com.TheThingsNetwork.api.broker import broker_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_broker_dot_broker__pb2
+from ttn.github_com.TheThingsNetwork.api.gateway import gateway_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_gateway_dot_gateway__pb2
+from ttn.github_com.TheThingsNetwork.api.handler import handler_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_handler_dot_handler__pb2
+from ttn.github_com.TheThingsNetwork.api.networkserver import networkserver_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_networkserver_dot_networkserver__pb2
+from ttn.github_com.TheThingsNetwork.api.router import router_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_router_dot_router__pb2
 from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
 
 

github_com/TheThingsNetwork/api/broker/__init__.py renamed to ttn/github_com/TheThingsNetwork/api/broker/__init__.py

@@ -1,9 +1,9 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-from github_com.TheThingsNetwork.api.broker import broker_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_broker_dot_broker__pb2
-from github_com.TheThingsNetwork.api.handler import handler_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_handler_dot_handler__pb2
-from github_com.TheThingsNetwork.api.networkserver import networkserver_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_networkserver_dot_networkserver__pb2
+from ttn.github_com.TheThingsNetwork.api.broker import broker_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_broker_dot_broker__pb2
+from ttn.github_com.TheThingsNetwork.api.handler import handler_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_handler_dot_handler__pb2
+from ttn.github_com.TheThingsNetwork.api.networkserver import networkserver_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_networkserver_dot_networkserver__pb2
 
 
 class NetworkServerStub(object):

github_com/TheThingsNetwork/api/broker/broker_pb2.py renamed to ttn/github_com/TheThingsNetwork/api/broker/broker_pb2.py

@@ -1,7 +1,7 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-from github_com.TheThingsNetwork.api.protocol.lorawan import device_address_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_protocol_dot_lorawan_dot_device__address__pb2
+from ttn.github_com.TheThingsNetwork.api.protocol.lorawan import device_address_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_protocol_dot_lorawan_dot_device__address__pb2
 
 
 class DevAddrManagerStub(object):

github_com/TheThingsNetwork/api/broker/broker_pb2_grpc.py renamed to ttn/github_com/TheThingsNetwork/api/broker/broker_pb2_grpc.py

@@ -1,7 +1,7 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-from github_com.TheThingsNetwork.api.protocol.lorawan import device_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_protocol_dot_lorawan_dot_device__pb2
+from ttn.github_com.TheThingsNetwork.api.protocol.lorawan import device_pb2 as github__com_dot_TheThingsNetwork_dot_api_dot_protocol_dot_lorawan_dot_device__pb2
 from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2