Merge pull request #123 from beer-garden/r2411

Update docker image to python 3.8 and pin additional dependencies

.github/workflows/pr-actions.yml

@@ -8,8 +8,8 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.7']
-        os: ['ubuntu-latest']
+        python-version: ["3.8"]
+        os: ["ubuntu-latest"]
 
     name: Linting OS ${{ matrix.os }} - Python ${{ matrix.python-version }}
     steps:
@@ -37,8 +37,8 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.7', '3.8']
-        os: ['ubuntu-latest']
+        python-version: ["3.8"]
+        os: ["ubuntu-latest"]
 
     name: PyTests OS ${{ matrix.os }} - Python ${{ matrix.python-version }}
     steps:
@@ -64,13 +64,12 @@ jobs:
         run: make test
 
   CodeCoverage:
-
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
-        python-version: ['3.7']
-        os: ['ubuntu-latest']
+        python-version: ["3.8"]
+        os: ["ubuntu-latest"]
 
     env:
       OS: ${{ matrix.os }}
@@ -105,4 +104,4 @@ jobs:
           coverage report -m
           coverage xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v1

.github/workflows/tag-actions.yml

@@ -3,20 +3,19 @@ name: Tag-Actions
 on:
   push:
     tags:
-      - '*'
+      - "*"
 
 jobs:
   PyPI:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        python-version: ['3.7']
+        python-version: ["3.8"]
 
     name: Python ${{ matrix.python-version }} PyPi
 
     steps:
-
       - uses: actions/checkout@v2
 
       - name: Set up Python
@@ -59,4 +58,3 @@ jobs:
 
       - name: Build Images
         run: make publish-docker VERSION=${GITHUB_REF#refs/tags/}
-

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6-alpine
+FROM python:3.8-alpine
 ARG VERSION
 ENTRYPOINT ["bartender"]
 

Dockerfile.unstable

@@ -1,4 +1,4 @@
-FROM python:3.6-alpine
+FROM python:3.8-alpine
 WORKDIR /src
 ENTRYPOINT ["bartender"]
 

Makefile

@@ -88,7 +88,7 @@ format: ## Run black formatter in-line
 # Linting
 lint: ## check style with flake8
 	flake8 $(MODULE_NAME) $(TEST_DIR)
-	black -t py27 --check $(MODULE_NAME) $(PYTHON_TEST_DIR)
+	black --check $(MODULE_NAME) $(PYTHON_TEST_DIR)
 
 
 # Testing / Coverage

README.rst

@@ -37,7 +37,7 @@ Getting Started
 Pre-requisites
 --------------
 
-* Python >= 2.7, 3.4
+* Python >= 2.7, < 3.9
 * pip
 * Connectivity to MongoDB Server  - (Tested on 3.4)
 * Connectivity to Rabbitmq-Server - (Tested on 3.6)

bartender/_version.py

@@ -1 +1 @@
-__version__ = "2.4.10"
+__version__ = "2.4.11"

setup.py

@@ -27,7 +27,7 @@ def find_version(version_file):
     packages=(find_packages(exclude=["test", "test.*"])),
     license="MIT",
     keywords="bartender beer beer-garden beergarden",
-    install_requires=["bg-utils>=2.4.4", "pyrabbit2==1.0.7"],
+    install_requires=["bg-utils>=2.4.4", "pyrabbit2==1.0.7", "pymongo<4"],
     extras_require={
         ':python_version=="2.7"': [
             "future>=0.16.0",
@@ -45,6 +45,8 @@ def find_version(version_file):
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
     ],
     entry_points={
         "console_scripts": [