Merge branch 'master' into master

canonical-ols · Sep 22, 2021 · 70c9f62 · 70c9f62
2 parents f97844e + cc3701c
commit 70c9f62
Show file tree

Hide file tree

Showing 73 changed files with 138 additions and 430 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.20.0
+current_version = 0.21.0
 commit = True
 tag = True
 

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: [2.7, 3.5, 3.6, 3.7, 3.8]
+        python: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2018 Canonical, Ltd.
+Copyright (c) 2015-2021 Canonical, Ltd.
 
 Licensed to the Apache Software Foundation (ASF) under one or more contributor
 license agreements.  See the NOTICE file distributed with this work for

diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ VENV = $(VENV_PATH)/ready
 BIN = $(VENV_PATH)/bin
 PY3 = $(shell which python3)
 PYTHON ?= $(shell readlink -f $(PY3))
-TALISKER_EXTRAS=gunicorn,raven,flask,django,celery,prometheus,pg_wheel,dev,asyncio
+TALISKER_EXTRAS=gunicorn,raven,flask,django,celery,prometheus,pg,dev,asyncio
 LIMBO_REQUIREMENTS=tests/requirements.limbo.txt
 REQUIREMENTS=$(shell ls requirements.*.txt)
 PIP_REQUIREMENTS=
@@ -143,7 +143,7 @@ clean-pyc:
 	find . -name '__pycache__' | xargs rm -rf
 
 clean-test:
-	rm .tox/ .pytest_cache .coverage* htmlcov/ results logstash-test-results tests/requirements.limbo.txt -rf 
+	rm .tox/ .pytest_cache .coverage* htmlcov/ results logstash-test-results tests/requirements.limbo.txt -rf
 
 
 # publishing
@@ -271,8 +271,8 @@ export REPORT_PY
 
 define CONFIG
 input { stdin { type => talisker }}
-output { 
-    file { 
+output {
+    file {
        path => "$(LOGSTASH_PATTERNS_LXC)/$(LOGSTASH_RESULTS)"
        codec => json_lines
     }

diff --git a/dependencies.txt b/dependencies.txt
@@ -2,6 +2,5 @@ build-essential
 libpq-dev
 postgresql
 python3-dev
-python2.7-dev
 redis-server
 virtualenv
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2015-2018 Canonical, Ltd.
+# Copyright (c) 2015-2021 Canonical, Ltd.
 #
 # This file is part of Talisker
 # (see http://github.com/canonical-ols/talisker).
@@ -67,13 +67,13 @@
 
 # General information about the project.
 project = u'talisker'
-copyright = u'2016, Canonical Ltd'
+copyright = u'2021, Canonical Ltd'
 
 # The version info for the project you're documenting, acts as replacement
 # for |version| and |release|, also used in various other places throughout
 # the built documents.
 # The short X.Y version.
-version = '0.20.0'
+version = '0.21.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/scripts/build_setup.py b/scripts/build_setup.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015-2018 Canonical, Ltd.
+# Copyright (c) 2015-2021 Canonical, Ltd.
 #
 # This file is part of Talisker
 # (see http://github.com/canonical-ols/talisker).
@@ -56,7 +56,7 @@ def print_line(k, v, indent='    '):
 
 print("""#!/usr/bin/env python
 #
-# Copyright (c) 2015-2018 Canonical, Ltd.
+# Copyright (c) 2015-2021 Canonical, Ltd.
 #
 # This file is part of Talisker
 # (see http://github.com/canonical-ols/talisker).

diff --git a/scripts/limbo.py b/scripts/limbo.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015-2018 Canonical, Ltd.
+# Copyright (c) 2015-2021 Canonical, Ltd.
 #
 # This file is part of Talisker
 # (see http://github.com/canonical-ols/talisker).

diff --git a/setup.cfg b/setup.cfg
@@ -14,25 +14,27 @@ filterwarnings = ignore
 
 [metadata]
 name = talisker
-version = 0.20.0
+version = 0.21.0
 description = A common WSGI stack
 long_description = file: README.rst
 author = Simon Davy
 author_email = [email protected]
 url = https://github.com/canonical-ols/talisker
 keywords = talisker
-classifiers = 
+classifiers =
 	License :: OSI Approved :: Apache Software License
 	Development Status :: 4 - Beta
 	Intended Audience :: Developers
 	Natural Language :: English
 	Topic :: Internet :: WWW/HTTP :: WSGI
 	Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware
 	Topic :: System :: Logging
-	Programming Language :: Python :: 2.7
-	Programming Language :: Python :: 3.4
 	Programming Language :: Python :: 3.5
 	Programming Language :: Python :: 3.6
+	Programming Language :: Python :: 3.7
+	Programming Language :: Python :: 3.8
+	Programming Language :: Python :: 3.9
+	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: Implementation :: CPython
 
 [options]
@@ -41,45 +43,41 @@ include_package_data = True
 packages = talisker
 test_suite = tests
 package_dir = talisker=talisker
-install_requires = 
+install_requires =
 	Werkzeug>=0.10.4,<1.2
 	statsd>=3.2.1,<4.0
 	requests>=2.18.0,<3.0
 	future>=0.15.2,<=0.18.2
-	ipaddress>=1.0.16,<2.0;python_version<"3.3"
 	contextvars==2.4;python_version>="3.5" and python_version<"3.7"
 
 [options.extras_require]
-gunicorn = gunicorn>=19.7.0,<21.0
-raven = raven>=6.4.0,<7.0
+gunicorn = gunicorn>=19.7.0
+raven = raven>=6.4.0
 celery =
-	celery>=3.1.25.0,<4.4.7;python_version<"3.6"
-	celery>=3.1.25.0,<=5.0.5;python_version>="3.6"
-django = django>=1.10,<2.0
+	celery>=3.1.25.0,<4.4.7;python_version<="3.5"
+	celery>=4,<5.3;python_version>"3.5"
+django = django>=1.10,<4.0
 prometheus = prometheus-client>=0.5.0,<0.8.0
-flask = 
+flask =
 	flask>=0.11,<1.2
 	blinker>=1.4,<2.0
-dev = 
+dev =
 	logging_tree>=1.7
 	pygments>=2.2
 	psutil>=5.0
 	objgraph>=3.0
 pg =
-	sqlparse>=0.2
-	psycopg2>=2.7.3.2,<3.0
-pg_wheel =
-	sqlparse>=0.2
-	psycopg2-binary>=2.7.3.2,<3.0
-asyncio = 
+	sqlparse>=0.3.1
+	psycopg2>=2.8,<3.0
+asyncio =
 	aiocontextvars==0.2.2;python_version>="3.5" and python_version<"3.7"
 gevent = gevent>=1.5.0
 
 [options.package_data]
 talisker = logstash/*
 
 [options.entry_points]
-console_scripts = 
+console_scripts =
 	talisker=talisker:run_gunicorn[gunicorn]
 	talisker.run=talisker:run
 	talisker.gunicorn=talisker:run_gunicorn[gunicorn]

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2015-2018 Canonical, Ltd.
+# Copyright (c) 2015-2021 Canonical, Ltd.
 #
 # This file is part of Talisker
 # (see http://github.com/canonical-ols/talisker).
@@ -59,6 +59,10 @@
 It integrates with many standard python libraries to give you out-of-the-box
 logging, metrics, error reporting, status urls and more.
 
+Python version support
+----------------------
+
+This release of talisker (0.20.0) will be the last to support python 2.7
 
 Quick Start
 -----------
@@ -116,10 +120,12 @@
         'Topic :: Internet :: WWW/HTTP :: WSGI',
         'Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware',
         'Topic :: System :: Logging',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: Implementation :: CPython',
     ],
     description='A common WSGI stack',
@@ -139,8 +145,8 @@
             'aiocontextvars==0.2.2;python_version>="3.5" and python_version<"3.7"',
         ],
         celery=[
-            'celery>=3.1.25.0,<4.4.7;python_version<"3.6"',
-            'celery>=3.1.25.0,<=5.0.5;python_version>="3.6"',
+            'celery>=3.1.25.0,<4.4.7;python_version<="3.5"',
+            'celery>=4,<5.3;python_version>"3.5"',
         ],
         dev=[
             'logging_tree>=1.7',
@@ -149,7 +155,7 @@
             'objgraph>=3.0',
         ],
         django=[
-            'django>=1.10,<2.0',
+            'django>=1.10,<4.0',
         ],
         flask=[
             'flask>=0.11,<1.2',
@@ -159,21 +165,17 @@
             'gevent>=1.5.0',
         ],
         gunicorn=[
-            'gunicorn>=19.7.0,<21.0',
+            'gunicorn>=19.7.0',
         ],
         pg=[
-            'sqlparse>=0.2',
-            'psycopg2>=2.7.3.2,<3.0',
-        ],
-        pg_wheel=[
-            'sqlparse>=0.2',
-            'psycopg2-binary>=2.7.3.2,<3.0',
+            'sqlparse>=0.3.1',
+            'psycopg2>=2.8,<3.0',
         ],
         prometheus=[
             'prometheus-client>=0.5.0,<0.8.0',
         ],
         raven=[
-            'raven>=6.4.0,<7.0',
+            'raven>=6.4.0',
         ],
     ),
     include_package_data=True,
@@ -182,7 +184,6 @@
         'statsd>=3.2.1,<4.0',
         'requests>=2.18.0,<3.0',
         'future>=0.15.2,<=0.18.2',
-        'ipaddress>=1.0.16,<2.0;python_version<"3.3"',
         'contextvars==2.4;python_version>="3.5" and python_version<"3.7"',
     ],
     keywords=[

diff --git a/talisker/__init__.py b/talisker/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2018 Canonical, Ltd.
+# Copyright (c) 2015-2021 Canonical, Ltd.
 #
 # This file is part of Talisker
 # (see http://github.com/canonical-ols/talisker).
@@ -22,12 +22,6 @@
 #
 
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
-from builtins import *  # noqa
 import logging
 import sys
 import textwrap
@@ -48,7 +42,7 @@
     request_timeout,
 )
 
-__version__ = '0.20.0'
+__version__ = '0.21.0'
 __all__ = [
     'initialise',
     'get_config',

diff --git a/talisker/__main__.py b/talisker/__main__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015-2018 Canonical, Ltd.
+# Copyright (c) 2015-2021 Canonical, Ltd.
 #
 # This file is part of Talisker
 # (see http://github.com/canonical-ols/talisker).

diff --git a/talisker/celery.py b/talisker/celery.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015-2018 Canonical, Ltd.
+# Copyright (c) 2015-2021 Canonical, Ltd.
 #
 # This file is part of Talisker
 # (see http://github.com/canonical-ols/talisker).
@@ -22,13 +22,6 @@
 # under the License.
 #
 
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
-from builtins import *  # noqa
-
 import logging
 import time
 

diff --git a/talisker/config.py b/talisker/config.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015-2018 Canonical, Ltd.
+# Copyright (c) 2015-2021 Canonical, Ltd.
 #
 # This file is part of Talisker
 # (see http://github.com/canonical-ols/talisker).
@@ -23,11 +23,6 @@
 #
 
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
 from builtins import *  # noqa
 __metaclass__ = type
 

diff --git a/talisker/context.py b/talisker/context.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015-2018 Canonical, Ltd.
+# Copyright (c) 2015-2021 Canonical, Ltd.
 #
 # This file is part of Talisker
 # (see http://github.com/canonical-ols/talisker).
@@ -22,14 +22,6 @@
 # under the License.
 #
 
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
-from builtins import *  # noqa
-__metaclass__ = type
-
 import future.utils
 try:
     from collections.abc import Mapping, Sequence

diff --git a/talisker/django.py b/talisker/django.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015-2018 Canonical, Ltd.
+# Copyright (c) 2015-2021 Canonical, Ltd.
 #
 # This file is part of Talisker
 # (see http://github.com/canonical-ols/talisker).
@@ -22,12 +22,6 @@
 # under the License.
 #
 
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
-from builtins import *  # noqa
 import logging
 
 import talisker.sentry