Merge pull request #30 from nat-n/p36_support

#27 Add support for python 3.6

Author: cetanu

.github/workflows/ci.yml

@@ -3,25 +3,46 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  build:
+
+  run-tests:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        python-version: [ '3.6', '3.7' ]
+
+    name: Python ${{ matrix.python-version }} test
+
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: 3.7
+          python-version: ${{ matrix.python-version }}
       - uses: dschep/install-pipenv-action@v1
       - name: Install dependencies
         run: |
           sudo apt install protobuf-compiler libprotobuf-dev
-          pipenv install --dev
+          pipenv install --dev --python ${pythonLocation}/python
       - name: Run tests
         run: |
           cp .env.default .env
           pipenv run pip install -e .
           pipenv run generate
           pipenv run test
+
+  build-release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+      - uses: dschep/install-pipenv-action@v1
+      - name: Install dependencies
+        run: |
+          sudo apt install protobuf-compiler libprotobuf-dev
+          pipenv install --dev --python ${pythonLocation}/python
       - name: Build package
         if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
         run: pipenv run python setup.py sdist

.gitignore

@@ -2,6 +2,8 @@
 .vscode/settings.json
 .mypy_cache
 .pytest_cache
+.python-version
+build/
 betterproto/tests/*.bin
 betterproto/tests/*_pb2.py
 betterproto/tests/*.py

Pipfile

@@ -9,16 +9,19 @@ mypy = "*"
 isort = "*"
 pytest = "*"
 rope = "*"
+v = {editable = true,version = "*"}
 
 [packages]
 protobuf = "*"
 jinja2 = "*"
 grpclib = "*"
 stringcase = "*"
 black = "*"
+backports-datetime-fromisoformat = "*"
+dataclasses = "*"
 
 [requires]
-python_version = "3.7"
+python_version = "3.6"
 
 [scripts]
 plugin = "protoc --plugin=protoc-gen-custom=betterproto/plugin.py --custom_out=output"

Pipfile.lock

@@ -6,7 +6,7 @@ This project aims to provide an improved experience when using Protobuf / gRPC i
 
 - Protobuf 3 & gRPC code generation
   - Both binary & JSON serialization is built-in
-- Python 3.7+ making use of:
+- Python 3.6+ making use of:
   - Enums
   - Dataclasses
   - `async`/`await`
@@ -296,7 +296,7 @@ datetime.datetime(2019, 1, 1, 11, 59, 58, 800000, tzinfo=datetime.timezone.utc)
 
 ## Development
 
-First, make sure you have Python 3.7+ and `pipenv` installed, along with the official [Protobuf Compiler](https://github.com/protocolbuffers/protobuf/releases) for your platform. Then:
+First, make sure you have Python 3.6+ and `pipenv` installed, along with the official [Protobuf Compiler](https://github.com/protocolbuffers/protobuf/releases) for your platform. Then:
 
 ```sh
 # Get set up with the virtual env & dependencies

README.md

@@ -3,6 +3,7 @@
 import inspect
 import json
 import struct
+import sys
 from abc import ABC
 from base64 import b64encode, b64decode
 from datetime import datetime, timedelta, timezone
@@ -33,6 +34,13 @@
 if TYPE_CHECKING:
     from grpclib._protocols import IProtoMessage
 
+if not (sys.version_info.major == 3 and sys.version_info.minor >= 7):
+    # Apply backport of datetime.fromisoformat from 3.7
+    from backports.datetime_fromisoformat import MonkeyPatch
+
+    MonkeyPatch.patch_fromisoformat()
+
+
 # Proto 3 data types
 TYPE_ENUM = "enum"
 TYPE_BOOL = "bool"
@@ -569,10 +577,10 @@ def _get_field_default(self, field: dataclasses.Field, meta: FieldMetadata) -> A
 
         value: Any = 0
         if hasattr(t, "__origin__"):
-            if t.__origin__ == dict:
+            if t.__origin__ in (dict, Dict):
                 # This is some kind of map (dict in Python).
                 value = {}
-            elif t.__origin__ == list:
+            elif t.__origin__ in (list, List):
                 # This is some kind of list (repeated) field.
                 value = []
             elif t.__origin__ == Union and t.__args__[1] == type(None):
@@ -704,7 +712,9 @@ def parse(self: T, data: bytes) -> T:
     def FromString(cls: Type[T], data: bytes) -> T:
         return cls().parse(data)
 
-    def to_dict(self, casing: Casing = Casing.CAMEL, include_default_values: bool = False) -> dict:
+    def to_dict(
+        self, casing: Casing = Casing.CAMEL, include_default_values: bool = False
+    ) -> dict:
         """
         Returns a dict representation of this message instance which can be
         used to serialize to e.g. JSON. Defaults to camel casing for

betterproto/__init__.py

@@ -191,25 +191,22 @@ class TestMessage(betterproto.Message):
     test = TestMessage().from_dict({})
 
     assert test.to_dict(include_default_values=True) == {
-        'someInt': 0,
-        'someDouble': 0.0,
-        'someStr': '',
-        'someBool': False
+        "someInt": 0,
+        "someDouble": 0.0,
+        "someStr": "",
+        "someBool": False,
     }
 
     # All default values
-    test = TestMessage().from_dict({
-        'someInt': 0,
-        'someDouble': 0.0,
-        'someStr': '',
-        'someBool': False
-    })
+    test = TestMessage().from_dict(
+        {"someInt": 0, "someDouble": 0.0, "someStr": "", "someBool": False}
+    )
 
     assert test.to_dict(include_default_values=True) == {
-        'someInt': 0,
-        'someDouble': 0.0,
-        'someStr': '',
-        'someBool': False
+        "someInt": 0,
+        "someDouble": 0.0,
+        "someStr": "",
+        "someBool": False,
     }
 
     # Some default and some other values
@@ -224,26 +221,28 @@ class TestMessage2(betterproto.Message):
         some_default_str: str = betterproto.string_field(7)
         some_default_bool: bool = betterproto.bool_field(8)
 
-    test = TestMessage2().from_dict({
-        'someInt': 2,
-        'someDouble': 1.2,
-        'someStr': 'hello',
-        'someBool': True,
-        'someDefaultInt': 0,
-        'someDefaultDouble': 0.0,
-        'someDefaultStr': '',
-        'someDefaultBool': False
-    })
+    test = TestMessage2().from_dict(
+        {
+            "someInt": 2,
+            "someDouble": 1.2,
+            "someStr": "hello",
+            "someBool": True,
+            "someDefaultInt": 0,
+            "someDefaultDouble": 0.0,
+            "someDefaultStr": "",
+            "someDefaultBool": False,
+        }
+    )
 
     assert test.to_dict(include_default_values=True) == {
-        'someInt': 2,
-        'someDouble': 1.2,
-        'someStr': 'hello',
-        'someBool': True,
-        'someDefaultInt': 0,
-        'someDefaultDouble': 0.0,
-        'someDefaultStr': '',
-        'someDefaultBool': False
+        "someInt": 2,
+        "someDouble": 1.2,
+        "someStr": "hello",
+        "someBool": True,
+        "someDefaultInt": 0,
+        "someDefaultDouble": 0.0,
+        "someDefaultStr": "",
+        "someDefaultBool": False,
     }
 
     # Nested messages
@@ -257,15 +256,10 @@ class TestParentMessage(betterproto.Message):
         some_double: float = betterproto.double_field(2)
         some_message: TestChildMessage = betterproto.message_field(3)
 
-    test = TestParentMessage().from_dict({
-        'someInt': 0,
-        'someDouble': 1.2,
-    })
+    test = TestParentMessage().from_dict({"someInt": 0, "someDouble": 1.2,})
 
     assert test.to_dict(include_default_values=True) == {
-        'someInt': 0,
-        'someDouble': 1.2,
-        'someMessage': {
-            'someOtherInt': 0
-        }
+        "someInt": 0,
+        "someDouble": 1.2,
+        "someMessage": {"someOtherInt": 0},
     }

betterproto/__pycache__/__init__.cpython-37.pyc

@@ -1,5 +1,5 @@
 [tool.black]
-target-version = ['py37']
+target-version = ['py36']
 
 [tool.isort]
 multi_line_output = 3

betterproto/tests/test_features.py

@@ -17,8 +17,13 @@
         exclude=["tests", "*.tests", "*.tests.*", "output", "output.*"]
     ),
     package_data={"betterproto": ["py.typed", "templates/template.py"]},
-    python_requires=">=3.7",
-    install_requires=["grpclib", "stringcase"],
+    python_requires=">=3.6",
+    install_requires=[
+        'dataclasses; python_version<"3.7"',
+        'backports-datetime-fromisoformat; python_version<"3.7"',
+        "grpclib",
+        "stringcase",
+    ],
     extras_require={"compiler": ["black", "jinja2", "protobuf"]},
     zip_safe=False,
 )