Merge ~cjwatson/ols-charm-deps:platform-dist-is-deprecated into ols-charm-deps:master

[Colin Watson]

Use distro.linux_distribution rather than platform.dist

platform.dist was deprecated in Python 3.5 and removed in Python 3.8. The distro package is the recommended replacement.

Dependencies MP: https://code.launchpad.net/~cjwatson/ols-charm-deps/+git/wheels/+merge/379822

[Guillermo Gonzalez (verterok)]

nice! +1

review: Approve

diff --git a/layer/ols-celery/reactive/ols_celery.py b/layer/ols-celery/reactive/ols_celery.py
index 6219dc0..6c1e3d8 100644
--- a/layer/ols-celery/reactive/ols_celery.py
+++ b/layer/ols-celery/reactive/ols_celery.py
@@ -1,7 +1,8 @@
 import os
-import platform
 import subprocess
 
+from charmhelpers.core import hookenv, host
+from charmhelpers.core.templating import render
 from charms.reactive import (
     hook,
     when,
@@ -9,12 +10,10 @@ from charms.reactive import (
     set_state,
     remove_state,
 )
+import distro
 
 from ols import base, celery
 
-from charmhelpers.core import hookenv, host
-from charmhelpers.core.templating import render
-
 # states #
 
 
@@ -79,7 +78,7 @@ def configure_celery(rabbitmq):
         env_file = "/srv/celery/environment_variables"
         context['env_file'] = env_file
 
-        if platform.dist()[-1] == 'trusty':
+        if distro.linux_distribution()[-1] == 'trusty':
             render(source='worker.conf.tmpl',
                    target='/etc/init/{}-worker.conf'.format(worker_name),
                    context=context)
@@ -97,7 +96,7 @@ def configure_celery(rabbitmq):
             context['env_extra'] = sorted(env_extra.items())
             context['celerybeat_working_dir'] = celerybeat_dir
             # render celerybeat init config
-            if platform.dist()[-1] == 'trusty':
+            if distro.linux_distribution()[-1] == 'trusty':
                 render(source='celerybeat.conf.tmpl',
                        target='/etc/init/{}-celerybeat.conf'.format(
                            worker_name),
@@ -109,7 +108,7 @@ def configure_celery(rabbitmq):
                        context=context)
 
         # render env vars file and reload systemd
-        if platform.dist()[-1] != 'trusty':
+        if distro.linux_distribution()[-1] != 'trusty':
             log_path = context['log_path'] = '/var/log/celery.log'
             render(source='celery_env_vars.tmpl',
                    target=env_file,
diff --git a/layer/ols-wsgi/lib/ols/gunicorn.py b/layer/ols-wsgi/lib/ols/gunicorn.py
index f707ed8..0fe9d9b 100755
--- a/layer/ols-wsgi/lib/ols/gunicorn.py
+++ b/layer/ols-wsgi/lib/ols/gunicorn.py
@@ -2,7 +2,6 @@
 # vim: et ai ts=4 sw=4:
 
 import os
-import platform
 import subprocess
 
 from multiprocessing import cpu_count
@@ -10,6 +9,7 @@ from multiprocessing import cpu_count
 from charmhelpers.core import hookenv
 from charmhelpers.core import host
 from charmhelpers.core.templating import render
+import distro
 
 from ols import base, wsgi, http
 
@@ -103,7 +103,7 @@ def configure(working_dir, port, user, group, env_extra, access_logfile='-'):
         'written gunicorn config for %s to %s' % (service_name, config_file))
     render(source='runner.tmpl', target=runner_file, context=wsgi_config,
            group=base.user(), perms=0o755)
-    if platform.dist()[-1] == 'trusty':
+    if distro.linux_distribution()[-1] == 'trusty':
         render(source='upstart.tmpl', target=upstart_file, context=wsgi_config)
         # upstart job sends logs to /var/log/upstart/gunicorn.log, which is
         # automatically rotated
diff --git a/layer/ols/lib/ols/base.py b/layer/ols/lib/ols/base.py
index 7fdedf9..b9557b7 100644
--- a/layer/ols/lib/ols/base.py
+++ b/layer/ols/lib/ols/base.py
@@ -1,12 +1,12 @@
 import ast
 from collections import OrderedDict
 import os
-import platform
 import shutil
 import subprocess
 
 from charmhelpers.core import hookenv, host, unitdata
 from charmhelpers.payload import archive
+import distro
 
 
 # Layer configs #
@@ -303,7 +303,7 @@ def create_virtualenv(wheels_dir, codedir, python_exe):
             hookenv.log('Enabling system site-packages in venv')
             cmd.append('--system-site-packages')
 
-        if platform.dist()[-1] != 'trusty':
+        if distro.linux_distribution()[-1] != 'trusty':
             cmd.append('--no-download')
             cmd.append('--extra-search-dir={}'.format(wheels_dir))
 
diff --git a/layer/ols/wheelhouse.txt b/layer/ols/wheelhouse.txt
new file mode 100644
index 0000000..49bc52e
--- /dev/null
+++ b/layer/ols/wheelhouse.txt
@@ -0,0 +1 @@
+distro==1.4.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 6a397f1..0bfcd81 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,4 @@
 PyYAML
 charms.reactive
 charmhelpers
+distro