mirror of
https://github.com/GSA/notifications-api.git
synced 2026-01-30 06:21:50 -05:00
Merge pull request #2853 from alphagov/dependency-upgrades
Dependency upgrades
This commit is contained in:
Katie Smith
@@ -43,11 +43,6 @@ def _validate_datetime_not_more_than_96_hours_in_future(dte, msg="Date cannot be
|
||||
raise ValidationError(msg)
|
||||
|
||||
|
||||
def _validate_not_in_future(dte, msg="Date cannot be in the future"):
|
||||
if dte > date.today():
|
||||
raise ValidationError(msg)
|
||||
|
||||
|
||||
def _validate_not_in_past(dte, msg="Date cannot be in the past"):
|
||||
if dte < date.today():
|
||||
raise ValidationError(msg)
|
||||
@@ -447,20 +442,6 @@ class SmsTemplateNotificationSchema(SmsNotificationSchema):
|
||||
job = fields.String()
|
||||
|
||||
|
||||
class JobSmsTemplateNotificationSchema(SmsNotificationSchema):
|
||||
template = fields.Str(required=True)
|
||||
job = fields.String(required=True)
|
||||
|
||||
|
||||
class JobEmailTemplateNotificationSchema(EmailNotificationSchema):
|
||||
template = fields.Str(required=True)
|
||||
job = fields.String(required=True)
|
||||
|
||||
|
||||
class SmsAdminNotificationSchema(SmsNotificationSchema):
|
||||
content = fields.Str(required=True)
|
||||
|
||||
|
||||
class NotificationWithTemplateSchema(BaseSchema):
|
||||
class Meta:
|
||||
model = models.Notification
|
||||
@@ -649,18 +630,6 @@ class EventSchema(BaseSchema):
|
||||
strict = True
|
||||
|
||||
|
||||
class DaySchema(ma.Schema):
|
||||
|
||||
class Meta:
|
||||
strict = True
|
||||
|
||||
day = fields.Date(required=True)
|
||||
|
||||
@validates('day')
|
||||
def validate_day(self, value):
|
||||
_validate_not_in_future(value)
|
||||
|
||||
|
||||
class UnarchivedTemplateSchema(BaseSchema):
|
||||
archived = fields.Boolean(required=True)
|
||||
|
||||
@@ -679,11 +648,8 @@ detailed_service_schema = DetailedServiceSchema()
|
||||
template_schema = TemplateSchema()
|
||||
api_key_schema = ApiKeySchema()
|
||||
job_schema = JobSchema()
|
||||
sms_admin_notification_schema = SmsAdminNotificationSchema()
|
||||
sms_template_notification_schema = SmsTemplateNotificationSchema()
|
||||
job_sms_template_notification_schema = JobSmsTemplateNotificationSchema()
|
||||
email_notification_schema = EmailNotificationSchema()
|
||||
job_email_template_notification_schema = JobEmailTemplateNotificationSchema()
|
||||
notification_schema = NotificationModelSchema()
|
||||
notification_with_template_schema = NotificationWithTemplateSchema()
|
||||
notification_with_personalisation_schema = NotificationWithPersonalisationSchema()
|
||||
@@ -697,5 +663,4 @@ template_history_schema = TemplateHistorySchema()
|
||||
event_schema = EventSchema()
|
||||
provider_details_schema = ProviderDetailsSchema()
|
||||
provider_details_history_schema = ProviderDetailsHistorySchema()
|
||||
day_schema = DaySchema()
|
||||
unarchived_template_schema = UnarchivedTemplateSchema()
|
||||
|
||||
@@ -6,20 +6,20 @@ celery[sqs]==3.1.26.post2 # pyup: <4
|
||||
docopt==0.6.2
|
||||
Flask-Bcrypt==0.7.1
|
||||
flask-marshmallow==0.11.0
|
||||
Flask-Migrate==2.5.2
|
||||
Flask-Migrate==2.5.3
|
||||
git+https://github.com/mitsuhiko/flask-sqlalchemy.git@500e732dd1b975a56ab06a46bd1a20a21e682262#egg=Flask-SQLAlchemy==2.3.2.dev20190108
|
||||
Flask==1.1.1
|
||||
Flask==1.1.2
|
||||
click-datetime==0.2
|
||||
eventlet==0.25.1
|
||||
eventlet==0.25.2
|
||||
gunicorn==20.0.4
|
||||
iso8601==0.1.12
|
||||
itsdangerous==1.1.0
|
||||
jsonschema==3.2.0
|
||||
marshmallow-sqlalchemy==0.22.3
|
||||
marshmallow==2.20.5 # pyup: <3 # v3 throws errors
|
||||
psycopg2-binary==2.8.4
|
||||
marshmallow-sqlalchemy==0.23.0
|
||||
marshmallow==2.21.0 # pyup: <3 # v3 throws errors
|
||||
psycopg2-binary==2.8.5
|
||||
PyJWT==1.7.1
|
||||
SQLAlchemy==1.3.13
|
||||
SQLAlchemy==1.3.17
|
||||
|
||||
notifications-python-client==5.5.1
|
||||
|
||||
|
||||
@@ -8,20 +8,20 @@ celery[sqs]==3.1.26.post2 # pyup: <4
|
||||
docopt==0.6.2
|
||||
Flask-Bcrypt==0.7.1
|
||||
flask-marshmallow==0.11.0
|
||||
Flask-Migrate==2.5.2
|
||||
Flask-Migrate==2.5.3
|
||||
git+https://github.com/mitsuhiko/flask-sqlalchemy.git@500e732dd1b975a56ab06a46bd1a20a21e682262#egg=Flask-SQLAlchemy==2.3.2.dev20190108
|
||||
Flask==1.1.1
|
||||
Flask==1.1.2
|
||||
click-datetime==0.2
|
||||
eventlet==0.25.1
|
||||
eventlet==0.25.2
|
||||
gunicorn==20.0.4
|
||||
iso8601==0.1.12
|
||||
itsdangerous==1.1.0
|
||||
jsonschema==3.2.0
|
||||
marshmallow-sqlalchemy==0.22.3
|
||||
marshmallow==2.20.5 # pyup: <3 # v3 throws errors
|
||||
psycopg2-binary==2.8.4
|
||||
marshmallow-sqlalchemy==0.23.0
|
||||
marshmallow==2.21.0 # pyup: <3 # v3 throws errors
|
||||
psycopg2-binary==2.8.5
|
||||
PyJWT==1.7.1
|
||||
SQLAlchemy==1.3.13
|
||||
SQLAlchemy==1.3.17
|
||||
|
||||
notifications-python-client==5.5.1
|
||||
|
||||
@@ -37,14 +37,14 @@ alembic==1.4.2
|
||||
amqp==1.4.9
|
||||
anyjson==0.3.3
|
||||
attrs==19.3.0
|
||||
awscli==1.18.53
|
||||
awscli==1.18.65
|
||||
bcrypt==3.1.7
|
||||
billiard==3.3.0.23
|
||||
bleach==3.1.4
|
||||
blinker==1.4
|
||||
boto==2.49.0
|
||||
boto3==1.10.38
|
||||
botocore==1.16.3
|
||||
botocore==1.16.15
|
||||
certifi==2020.4.5.1
|
||||
chardet==3.0.4
|
||||
click==7.1.2
|
||||
@@ -58,7 +58,7 @@ greenlet==0.4.15
|
||||
idna==2.9
|
||||
importlib-metadata==1.6.0
|
||||
Jinja2==2.11.2
|
||||
jmespath==0.9.5
|
||||
jmespath==0.10.0
|
||||
kombu==3.0.37
|
||||
Mako==1.1.2
|
||||
MarkupSafe==1.1.1
|
||||
@@ -76,11 +76,11 @@ python-editor==1.0.4
|
||||
python-json-logger==0.1.11
|
||||
pytz==2020.1
|
||||
PyYAML==5.3.1
|
||||
redis==3.5.0
|
||||
redis==3.5.2
|
||||
requests==2.23.0
|
||||
rsa==3.4.2
|
||||
s3transfer==0.3.3
|
||||
six==1.14.0
|
||||
six==1.15.0
|
||||
smartypants==2.0.1
|
||||
statsd==3.3.0
|
||||
urllib3==1.25.9
|
||||
|
||||
Reference in New Issue
Block a user