diff --git a/.travis.yml b/.travis.yml index c375b0c7c..9629f4168 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,15 @@ dist: xenial language: python python: - - &latest_py2 2.7 - - 3.5 - 3.6 - - &latest_py3 3.7 + - 3.7 + - &latest_py3 3.8 jobs: fast_finish: true include: - python: *latest_py3 env: LANG=C - - python: *latest_py2 - env: LANG=C - stage: deploy (to PyPI for tagged commits) if: tag IS present python: *latest_py3 diff --git a/README.md b/README.md index c482f5939..c734fa6fa 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,9 @@ As of version 0.1.0 and higher, Puppetboard **requires** PuppetDB 3. Version 0.3 At the current time of writing, Puppetboard supports the following Python versions: -* Python 2.7 (NB! [Python 2.7 is deprecated and should not be used](https://pythonclock.org/)) -* Python 3.5 * Python 3.6 * Python 3.7 +* Python 3.8 ![View of a node](screenshots/overview.png) @@ -330,7 +329,7 @@ Here is a sample configuration for Fedora: CustomLog logs/puppetboard-access_log combined Alias /static /usr/lib/pythonX.Y/site-packages/puppetboard/static - + Satisfy Any Allow from all @@ -533,7 +532,7 @@ import multiprocessing bind = '127.0.0.1:9090' workers = multiprocessing.cpu_count() * 2 + 1 -chdir = '/usr/lib/python2.7/site-packages/puppetboard' +chdir = '/usr/lib/pythonX.Y/site-packages/puppetboard' raw_env = ['PUPPETBOARD_SETTINGS=/var/www/puppetboard/settings.py', 'http_proxy='] ``` diff --git a/setup.py b/setup.py index 67928ee2d..77777368d 100644 --- a/setup.py +++ b/setup.py @@ -66,11 +66,9 @@ def run_tests(self): 'Natural Language :: English', 'License :: OSI Approved :: Apache Software License', 'Operating System :: POSIX', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', ], )