Skip to content

Commit

Permalink
Bump dependencies on 2020-10-07 (#64)
Browse files Browse the repository at this point in the history
* Bump dependencies

* Fix coding style

* Bump version
  • Loading branch information
AntoineAugusti committed Oct 7, 2020
1 parent 13d9c71 commit aac071f
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 26 deletions.
6 changes: 3 additions & 3 deletions notifications_utils/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ def after_request(response):
handlers = get_handlers(app)
loglevel = logging.getLevelName(app.config['NOTIFY_LOG_LEVEL'])
loggers = [app.logger, logging.getLogger('utils')]
for l, handler in product(loggers, handlers):
l.addHandler(handler)
l.setLevel(loglevel)
for current_logger, handler in product(loggers, handlers):
current_logger.addHandler(handler)
current_logger.setLevel(loglevel)
logging.getLogger('boto3').setLevel(logging.WARNING)
logging.getLogger('s3transfer').setLevel(logging.WARNING)
app.logger.info("Logging configured")
Expand Down
2 changes: 1 addition & 1 deletion notifications_utils/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = '43.0.5'
__version__ = '43.0.6'
# GDS version '34.0.1'
17 changes: 8 additions & 9 deletions requirements_for_test.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
-r requirements.txt
phonenumbers==8.10.13
pytest==5.1.2
pytest-mock==1.10.4
pytest-cov==2.7.1
pytest-xdist==1.29.0
requests-mock==1.7.0
freezegun==0.3.12
flake8==3.7.8
flake8-print==3.1.0
pytest==5.4.3
pytest-mock==1.13.0
pytest-cov==2.10.1
pytest-xdist==1.34.0
requests-mock==1.8.0
freezegun==0.3.15
flake8==3.8.4
flake8-print==3.1.4
20 changes: 10 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@
packages=find_packages(),
include_package_data=True,
install_requires=[
'bleach==3.1.4',
'bleach==3.2.1',
'mistune==0.8.4',
'requests==2.23.0',
'python-json-logger==0.1.11',
'requests==2.24.0',
'python-json-logger==2.0.0',
'Flask>=0.12.2',
'orderedset==2.0.1',
'Jinja2==2.11.1',
'orderedset==2.0.3',
'Jinja2==2.11.2',
'statsd==3.3.0',
'Flask-Redis==0.4.0',
'pyyaml==5.3.0',
'phonenumbers==8.10.13',
'pytz==2019.3',
'PyYAML==5.3.1',
'phonenumbers==8.12.10',
'pytz==2020.1',
'smartypants==2.0.1',
'monotonic==1.5',
'pypdf2==1.26.0',

# required by both api and admin
'awscli==1.18.13',
'boto3==1.12.13',
'awscli==1.18.154',
'boto3==1.15.13',
]
)
4 changes: 1 addition & 3 deletions tests/test_logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,13 @@ def test_should_build_complete_statsd_line():


def test_should_build_complete_statsd_line_without_service_id_prefix_for_admin_api_calls():
service_id = uuid.uuid4()
extra_fields = {
'method': "method",
'endpoint': "endpoint",
'status': 200,
'service_id': 'notify-admin'
}
assert "notify-admin.method.endpoint.200".format(
service_id=str(service_id)) == logging.build_statsd_line(extra_fields)
assert "notify-admin.method.endpoint.200" == logging.build_statsd_line(extra_fields)


def test_should_build_complete_statsd_line_ignoring_missing_fields():
Expand Down

0 comments on commit aac071f

Please sign in to comment.