Merge pull request #1 from QuaererePlatform/release/0.2.1

Release/0.2.1

VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

requirements.txt

@@ -1,8 +1,8 @@
 # Generated file, do not edit
-marshmallow>=2.16.0,<3
-quaerere-base-common
+marshmallow<3,>=2.16.0
+quaerere-base-common>=0.1.1
 pytest-runner
-Sphinx>=1.8.0,<2
+Sphinx<2,>=1.8.0
 sphinx-rtd-theme
 setuptools
 pytest>=4.2.0

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.0
+current_version = 0.2.1
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<pre_release>\.dev|a|b|rc)(?P<pre_release_num>\d+))?
 serialize = 
 	{major}.{minor}.{patch}{pre_release}{pre_release_num}

setup.py

@@ -2,24 +2,28 @@
 """Setup for the willamette micro-service, part of the Quaerere Platform
 """
 import os
+import re
 import sys
 
 from setuptools import setup
 from setuptools.command.install import install
 
 PROJECT_NAME = 'quaerere-willamette-common'
 INSTALL_REQUIRES = [
-    'marshmallow>=2.16.0,<3',
-    'quaerere-base-common', ]
+    'marshmallow<3,>=2.16.0',
+    'quaerere-base-common>=0.1.1',
+]
 SETUP_REQUIRES = [
     'pytest-runner',
-    'Sphinx>=1.8.0,<2',
+    'Sphinx<2,>=1.8.0',
     'sphinx-rtd-theme',
-    'setuptools']
+    'setuptools',
+]
 TESTS_REQUIRES = [
     'pytest>=4.2.0',
     'pytest-cov>=2.6.0',
-    'pytest-flake8', ]
+    'pytest-flake8',
+]
 
 
 def get_version():
@@ -38,6 +42,10 @@ class VerifyVersionCommand(install):
     description = 'verify that the git tag matches our version'
 
     def run(self):
+        release_regex = re.compile(r'^[0-9]+\.[0-9]+\.[0-9]+$')
+        if not release_regex.match(PROJECT_RELEASE):
+            sys.exit(0)
+
         tag = os.getenv('CIRCLE_TAG')
 
         if tag != 'v' + PROJECT_RELEASE:

willamette_common/schemas/api_v1/mixins/common.py

@@ -0,0 +1,6 @@
+from marshmallow import fields
+
+
+class SourceAccounting:
+    data_origin = fields.String(required=True)
+    datetime_acquired = fields.DateTime()

willamette_common/schemas/api_v1/mixins/web_pages.py

@@ -2,8 +2,11 @@
 
 from marshmallow import fields
 
+from .common import SourceAccounting
+
 
 class WebPageFieldsMixin:
-    text = fields.String()
+    source_accounting = fields.Nested(SourceAccounting, required=True)
+    text = fields.String(required=True)
     url = fields.Url(required=True)
     web_site_key = fields.String(required=True)

willamette_common/schemas/api_v1/mixins/web_sites.py

@@ -2,7 +2,10 @@
 
 from marshmallow import fields
 
+from .common import SourceAccounting
+
 
 class WebSiteFieldsMixin:
+    inLanguage = fields.String(allow_none=True)
+    source_accounting = fields.Nested(SourceAccounting, required=True)
     url = fields.Url(required=True)
-    inLanguage = fields.String()