nameko · mattbennett · Oct 2, 2018 · Oct 2, 2018 · Nov 19, 2018 · Nov 19, 2018
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -6,7 +6,7 @@ on:
       - "v*"
   pull_request:
     branches:
-      - master
+      - "*"
 
   schedule:
     - cron: '0 * * * 0'
@@ -20,14 +20,13 @@ jobs:
       matrix:
         python-version:
           - 3.9
-          - 2.7
 
     steps:
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: setup python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -47,13 +46,12 @@ jobs:
       matrix:
         python-version:
           - 3.9
-          - 2.7
     steps:
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: setup python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -78,11 +76,11 @@ jobs:
     strategy:
       matrix:
         python-version:
+          - "3.11"
+          - "3.10"
           - 3.9
           - 3.8
           - 3.7
-          - 3.6
-          - 2.7
         dependency-set:
           - pinned
           - latest
@@ -96,21 +94,21 @@ jobs:
         # allow failure for a job but not fail the workflow
         # see https://github.com/actions/toolkit/issues/399.
         # include:
-        #   - python-version: 3.6
+        #   - python-version: 3.7
         #     dependency-set: latest
         #     command: test-mastereventlet
         #     experimental: true
-        #   - python-version: 3.6
+        #   - python-version: 3.7
         #     dependency-set: latest
         #     command: test-branchcoverage
         #     experimental: true
 
     steps:
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: setup python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -137,15 +135,15 @@ jobs:
         TOXENV: py${{ matrix.python-version }}-${{ matrix.dependency-set }}-${{ matrix.command }}
 
   docs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: setup python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.6
+        python-version: 3.7
 
     - name: install libenchant
       run: |
@@ -172,10 +170,10 @@ jobs:
 
     steps:
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: setup python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.8'
 

diff --git a/CHANGES b/CHANGES
@@ -5,6 +5,7 @@ Here you can see the full list of changes between nameko versions. Versions
 are in form of *headline.major.minor* numbers. Backwards-compatible changes
 increment the minor version number only.
 
+
 Version 2.14.0
 --------------
 

diff --git a/Makefile b/Makefile
@@ -17,14 +17,14 @@ pylint:
 	pylint --rcfile=pylintrc nameko -E
 
 imports:
-	isort -rc $(autofix) nameko test
+	isort $(autofix) nameko test
 
 test_lib:
-	BRANCH=$(ENABLE_BRANCH_COVERAGE) coverage run -m nameko test test -v --strict --timeout 30
+	BRANCH=$(ENABLE_BRANCH_COVERAGE) coverage run -m nameko test test -v --strict-markers --timeout 30
 	BRANCH=$(ENABLE_BRANCH_COVERAGE) coverage report
 
 test_examples:
-	BRANCH=$(ENABLE_BRANCH_COVERAGE) nameko test docs/examples/test --strict --timeout 30 --cov=docs/examples --cov-config=$(CURDIR)/.coveragerc
+	BRANCH=$(ENABLE_BRANCH_COVERAGE) nameko test docs/examples/test --strict-markers --timeout 30 --cov=docs/examples --cov-config=$(CURDIR)/.coveragerc
 	nameko test docs/examples/testing
 
 test_docs: docs spelling #linkcheck

diff --git a/README.rst b/README.rst
@@ -64,6 +64,7 @@ Support
 
 For help, comments or questions, please go to `<https://discourse.nameko.io/>`_.
 
+
 For enterprise
 ---------------------
 

diff --git a/docs/api.rst b/docs/api.rst
@@ -0,0 +1,105 @@
+.. _api:
+
+API
+===
+
+AMQP
+----
+
+.. automodule:: nameko.amqp.consume
+    :members:
+
+.. automodule:: nameko.amqp.publish
+    :members:
+
+RPC
+^^^
+
+.. automodule:: nameko.rpc
+    :members:
+
+Events
+^^^^^^
+
+.. automodule:: nameko.events
+    :members:
+
+Messaging
+^^^^^^^^^
+
+.. automodule:: nameko.messaging
+    :members:
+
+
+Standalone
+^^^^^^^^^^
+
+.. automodule:: nameko.standalone
+    :members:
+
+.. automodule:: nameko.standalone.rpc
+    :members:
+
+.. automodule:: nameko.standalone.events
+    :members:
+
+HTTP
+----
+
+.. automodule:: nameko.web
+    :members:
+
+.. automodule:: nameko.web.handlers
+    :members:
+
+.. automodule:: nameko.web.server
+    :members:
+
+.. automodule:: nameko.web.websocket
+    :members:
+
+
+Testing
+-------
+
+.. automodule:: nameko.testing
+    :members:
+
+.. automodule:: nameko.testing.services
+    :members:
+
+.. automodule:: nameko.testing.waiting
+    :members:
+
+.. automodule:: nameko.testing.utils
+    :members:
+
+
+Utils
+-----
+
+.. automodule:: nameko.utils
+    :members:
+
+.. automodule:: nameko.utils.retry
+    :members:
+
+
+Core
+----
+
+
+.. automodule:: nameko.containers
+    :members:
+
+.. automodule:: nameko.extensions
+    :members:
+
+.. automodule:: nameko.exceptions
+    :members:
+
+.. automodule:: nameko.serialization
+    :members:
+
+.. automodule:: nameko.runners
+    :members:
diff --git a/docs/built_in_dependency_providers.rst b/docs/built_in_dependency_providers.rst
diff --git a/docs/built_in_extensions.rst b/docs/built_in_extensions.rst
@@ -8,7 +8,7 @@ Nameko includes a number of built-in :ref:`extensions <extensions>`. This sectio
 RPC
 ---
 
-Nameko includes an implementation of RPC over AMQP. It comprises the ``@rpc`` entrypoint, a proxy for services to talk to other services, and a standalone proxy that non-Nameko clients can use to make RPC calls to a cluster:
+Nameko includes an implementation of RPC over AMQP. It comprises the ``@rpc`` entrypoint, a client for services to talk to other services, and a standalone client that non-Nameko clients can use to make RPC calls to a cluster:
 
 .. literalinclude:: examples/rpc.py
 

diff --git a/docs/community_extensions.rst b/docs/community_extensions.rst
@@ -53,7 +53,7 @@ Extensions
     * `nameko-sendgrid <https://github.com/invictuscapital/nameko-sendgrid>`_
 
         SendGrid dependency for nameko, for sending transactional and marketing emails.
-        
+
     * `nameko-cachetools <https://github.com/santiycr/nameko-cachetools>`_
 
         Tools to cache RPC interactions between your nameko services.
@@ -71,7 +71,7 @@ Supplementary Libraries
 
     * `nameko-proxy <https://github.com/fraglab/nameko-proxy>`_
 
-        Standalone async proxy to communicate with Nameko microservices.
+        Standalone async client to communicate with Nameko microservices.
 
 Search PyPi for more `nameko packages <https://pypi.python.org/pypi?%3Aaction=search&term=nameko&submit=search>`_
 

diff --git a/docs/examples/anatomy.py b/docs/examples/anatomy.py
@@ -1,10 +1,11 @@
-from nameko.rpc import rpc, RpcProxy
+from nameko.rpc import ServiceRpc, rpc
+
 
 class Service:
     name = "service"
 
     # we depend on the RPC interface of "another_service"
-    other_rpc = RpcProxy("another_service")
+    other_rpc = ServiceRpc("another_service")
 
     @rpc  # `method` is exposed over RPC
     def method(self):

diff --git a/docs/examples/async_rpc.py b/docs/examples/async_rpc.py
@@ -1,4 +1,4 @@
-with ClusterRpcProxy(config) as cluster_rpc:
+with ClusterRpcClient() as cluster_rpc:
     hello_res = cluster_rpc.service_x.remote_method.call_async("hello")
     world_res = cluster_rpc.service_x.remote_method.call_async("world")
     # do work while waiting

diff --git a/docs/examples/auth.py b/docs/examples/auth.py
@@ -33,7 +33,7 @@ def authenticate(self, username, password):
                 'username': username,
                 'roles': self.users[username]['roles']
             }
-            token = jwt.encode(payload, key=JWT_SECRET).decode('utf-8')
+            token = jwt.encode(payload, key=JWT_SECRET, algorithm="HS256")
             self.worker_ctx.context_data['auth'] = token
             return token
 
@@ -43,7 +43,9 @@ def has_role(self, role):
                 raise Unauthenticated()
 
             try:
-                payload = jwt.decode(token, key=JWT_SECRET, verify=True)
+                payload = jwt.decode(
+                    token, key=JWT_SECRET, verify=True, algorithms=["HS256"]
+                )
                 if role in payload['roles']:
                     return True
             except Exception:

diff --git a/docs/examples/config_dependency_provider.py b/docs/examples/config_dependency_provider.py
diff --git a/docs/examples/rpc.py b/docs/examples/rpc.py
@@ -1,4 +1,5 @@
-from nameko.rpc import rpc, RpcProxy
+from nameko.rpc import ServiceRpc, rpc
+
 
 class ServiceY:
     name = "service_y"
@@ -11,7 +12,7 @@ def append_identifier(self, value):
 class ServiceX:
     name = "service_x"
 
-    y = RpcProxy("service_y")
+    y = ServiceRpc("service_y")
 
     @rpc
     def remote_method(self, value):

diff --git a/docs/examples/service_container.py b/docs/examples/service_container.py
@@ -4,7 +4,7 @@ class Service:
     name = "service"
 
 # create a container
-container = ServiceContainer(Service, config={})
+container = ServiceContainer(Service)
 
 # ``container.extensions`` exposes all extensions used by the service
 service_extensions = list(container.extensions)

diff --git a/docs/examples/service_runner.py b/docs/examples/service_runner.py
@@ -8,7 +8,7 @@ class ServiceB:
     name = "service_b"
 
 # create a runner for ServiceA and ServiceB
-runner = ServiceRunner(config={})
+runner = ServiceRunner()
 runner.add_service(ServiceA)
 runner.add_service(ServiceB)