Merge pull request #7 from hypoport/dev

- fix bug, when field is missing
- add pyproject.toml & flit support for publishing

Author: bweigel

.gitignore

@@ -122,3 +122,4 @@ venv.bak/
 /.pytest_cache/
 /coverage_html_report/
 report.xml
+.vscode/

Makefile

@@ -25,10 +25,7 @@ coverage:
 	pipenv run pytest --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=aws_dataclasses tests
 
 publish:
-	pip install 'twine>=1.5.0'
-	python setup.py sdist bdist_wheel
-	twine upload dist/*
-	rm -fr build dist .egg requests.egg-info
+	flit --repository testpypi publish
 
 docs:
 	cd docs && make html

Pipfile

@@ -15,6 +15,8 @@ bumpversion = "*"
 pytest-cov = "*"
 pytest-xdist = "*"
 codecov = "*"
+mypy = "*"
+flit = "*"
 
 [requires]
 python_version = "3.6"

Pipfile.lock

@@ -1,3 +1,9 @@
+"""
+python-aws-dataclasses
+"""
+
+__version__="0.4.1"
+
 from aws_dataclasses.sns_event import SnsEvent
 from aws_dataclasses.alexa_skill_event import AlexaSkillEvent
 from aws_dataclasses.s3_event import S3Event

aws_dataclasses/__init__.py

@@ -13,14 +13,14 @@ class CloudWatchAlarmTrigger(GenericDataClass):
     Namespace: InitVar[str] = field(repr=False)
     StatisticType: InitVar[str] = field(repr=False)
     Statistic: InitVar[str] = field(repr=False)
-    Unit: InitVar[str] = field(repr=False)
     Dimensions: InitVar[List[Dict]] = field(repr=False)
     Period: InitVar[int] = field(repr=False)
     EvaluationPeriods: InitVar[int] = field(repr=False)
     ComparisonOperator: InitVar[str] = field(repr=False)
     Threshold: InitVar[float] = field(repr=False)
     TreatMissingData: InitVar[str] = field(repr=False)
-    EvaluateLowSampleCountPercentile: InitVar[str] = field(repr=False)
+    EvaluateLowSampleCountPercentile: InitVar[str] = field(repr=False, default=None)
+    Unit: InitVar[str] = field(repr=False, default=None)
     metric_name: str = field(init=False)
     namespace: str = field(init=False)
     statistic_type: str = field(init=False)
@@ -34,9 +34,10 @@ class CloudWatchAlarmTrigger(GenericDataClass):
     treat_missing_data: str = field(init=False)
     evaluate_low_samplecount_percentile: str = field(init=False)
 
-    def __post_init__(self, MetricName: str, Namespace: str, StatisticType: str, Statistic: str, Unit: str,
-                      Dimensions: List[Dict], Period: int, EvaluationPeriods: int, ComparisonOperator: str,
-                      Threshold: float, TreatMissingData: str, EvaluateLowSampleCountPercentile: str):
+
+    def __post_init__(self, MetricName: str, Namespace: str, StatisticType: str, Statistic: str, Dimensions: List[Dict],
+                      Period: int, EvaluationPeriods: int, ComparisonOperator: str, Threshold: float,
+                      TreatMissingData: str, EvaluateLowSampleCountPercentile: str, Unit: str):
         self.metric_name = MetricName
         self.namespace = Namespace
         self.statistic_type = StatisticType

aws_dataclasses/cloudwatch_alarm.py

@@ -1,3 +1,4 @@
+import datetime
 from collections import namedtuple
 from datetime import datetime
 from typing import Dict, List

aws_dataclasses/sns_event.py

@@ -0,0 +1,32 @@
+[build-system]
+requires = ["flit"]
+build-backend = "flit.buildapi"
+
+[tool.flit.metadata]
+module = "aws_dataclasses"
+dist-name = "python-aws-dataclasses"
+author = "Benjamin Weigel"
+author-email = "[email protected]"
+home-page = "https://github.com/hypoport/python-aws-dataclasses"
+classifiers = [ 
+    "License :: OSI Approved :: MIT License",
+    'Development Status :: 4 - Beta',
+    'Programming Language :: Python'
+            ]
+
+keywords="aws lambda events"
+
+requires=[  'docutils>=0.3',
+            'dataclasses>=0.6',
+            'arrow>=0.11.0'
+        ]
+requires-python='>=3.6'
+
+description-file='README.md'
+
+[tool.flit.metadata.requires-extra]
+test = [
+    "pytest >=2.7.3",
+    "pytest-runner",
+]
+doc = ["sphinx"]

pyproject.toml

@@ -1,5 +1,7 @@
+# Remove setup.cfg eventually, when every tool supports providing options in pyproject.toml
+
 [bumpversion]
-current_version = 0.4.0
+current_version = 0.4.1
 commit = true
 tag = true
 tag_name = {new_version}
@@ -24,7 +26,7 @@ log_cli_level = DEBUG
 junit_suite_name = python-aws-dataclasses
 collect_ignore = ['setup.py']
 
-[bumpversion:file:setup.py]
-search = version="{current_version}"
-replace = version="{new_version}"
+[bumpversion:file:aws_dataclasses/__init__.py]
+search = __version__="{current_version}"
+replace = __version__="{new_version}"
 

setup.cfg

@@ -6,7 +6,7 @@
       "EventSource": "aws:sns",
       "Sns": {
         "SignatureVersion": "1",
-        "Timestamp": "1970-01-01T00:00:00.000Z",
+        "Timestamp": "1970-01-01T00:00:12.000Z",
         "Signature": "EXAMPLE",
         "SigningCertUrl": "EXAMPLE",
         "MessageId": "95df01b4-ee98-5cb9-9903-4c221d41eb5e",