PEP 517

Author: pcisar

oid/platforms.oid

@@ -21,7 +21,7 @@ children:
     description: Firebird Butler Development & Deployment Platform in Python 3, also provides reference implementations for Firebird Burtler standards
     contact: Pavel Císař
     email: pcisar@users.sourceforge.net
-    site: https://firebirdsql.org/en/saturnin-sdk/
+    site: https://firebirdsql.org/en/saturnin/
     node-spec: https://raw.githubusercontent.com/FirebirdSQL/saturnin/master/oid/saturnin.oid
   - number: 1
     name: java-sdk

python/setup.cfg

@@ -5,7 +5,7 @@ all-files=True
 
 [metadata]
 name = firebird-butler-protobuf
-version = 0.3.0
+version = 0.3.1
 description = Firebird Butler protocol buffers
 long_description = file: README.rst
 long_description_content_type = text/x-rst; charset=UTF-8
@@ -35,7 +35,7 @@ classifiers =
 zip_safe = True
 python_requires = >=3.8, <4
 install_requires =
-    protobuf>=3.13.0
+    protobuf>=3.14.0
 packages = find_namespace:
 
 [options.packages.find]

python/setup.py

@@ -1,11 +1,10 @@
+#!/usr/bin/env python
 #coding:utf-8
-"""A setuptools based setup module for firebird-butler-protobuf package.
-See:
-https://packaging.python.org/en/latest/distributing.html
-https://github.com/pypa/sampleproject
-"""
 
-# Always prefer setuptools over distutils
-from setuptools import setup
+# This file is only a shim to allow editable installs. It's not necessary to build
+# and install the package via pip (see pyproject.toml and setup.cfg).
 
-setup()
+import setuptools
+
+if __name__ == "__main__":
+    setuptools.setup()

rfc/4/FBSP.rst

@@ -329,7 +329,7 @@ The CANCEL message represents a request for a `Service` to stop processing the p
 2. The content of type-data_ field in this message is not significant.
 3. The message MUST have a data-frame_ with specification of the request whose processing is to be terminated. The data-frame_ MAY contain additional information.
 4. The `Service` MUST respond with the ERROR_ message with appropriate `Error Code`_. 
-5. If `Service` successfully terminated specified active `Client` request, the ERROR_ message MUST have `Request Canceled` `Error Code`_.
+5. If `Service` successfully terminated specified active `Client` request, the ERROR_ message MUST have `Request Cancelled` `Error Code`_.
 6. The ERROR_ message MAY have a data-frame_ with additional information.
 
 .. seealso::
@@ -401,14 +401,14 @@ ACK-REQUEST
 
 The ACK-REQUEST flag is intended for verification and synchronization purposes.
 
-1. Any received control-frame_ of message-type_ NOOP_, REQUEST_, REPLY_, DATA_, STATE_ or CANCEL_ that have ACK-REQUEST flag set SHALL be sent back to the sender as confirmation of accepted message, unless the receiver is a `Service` and an error condition occurs. In such a case the ERROR_ message SHALL be sent by `Service` instead confirmation message.
+1. Any received control-frame_ of message-type_ NOOP_, REQUEST_, REPLY_, DATA_ or STATE_ that have ACK-REQUEST flag set SHALL be sent back to the sender as confirmation of accepted message, unless the receiver is a `Service` and an error condition occurs. In such a case the ERROR_ message SHALL be sent by `Service` instead confirmation message.
 2. Returned confirmatory message SHALL consists only from the received control-frame_ with ACK-REQUEST flag cleared, and with ACK-REPLY_ flag set (ie the control-frame_ MUST be otherwise unchanged).
 3. The ACK-REQUEST flag SHALL be ignored for all message-type_ values not listed in rule 1.
 
 Rules for ACK-REQUEST received by `Service`:
 
 1. NOOP_ message SHALL be acknowledged without any delay.
-2. REQUEST_ and CANCEL_ messages SHALL be acknowledged at the time the `Service` has positively decided to accept the client's request and before commencing the fulfillment of the client's request.
+2. REQUEST_ message SHALL be acknowledged at the time the `Service` has positively decided to accept the client's request and before commencing the fulfillment of the client's request.
 3. DATA_ message SHALL be acknowledged without any delay, unless a previous agreement between the `Client` and the `Service` exists to handle it differently (for example to send it when DATA message is actually processed and Service is able to accept another DATA message).
 
 Rules for ACK-REQUEST received by `Client`:
@@ -624,7 +624,7 @@ CANCEL data
    }
 
 :token:
-  MANDATORY message-token_ of the message to be canceled.
+  MANDATORY message-token_ of the message to be cancelled.
 
 :supplement:
   Any additional information required or supported by Service API specification for cancellation of particular message.
@@ -749,9 +749,9 @@ Errors indicating that particular request cannot be satisfied
 
   The service is unable to store data needed to successfully complete the request.
 
-:17 - Request Canceled:
+:17 - Request Cancelled:
 
-  The client's request was canceled by CANCEL_ request.
+  The client's request was cancelled by CANCEL_ request.
 
 
 Fatal errors indicating that connection would/should be terminated