Merge tag '22.0.0' into develop

Author: felliott

CHANGELOG

@@ -2,6 +2,16 @@
 ChangeLog
 *********
 
+22.0.0 (2022-05-27)
+===================
+- Feature: Improve Hypothes.is annotations by allowing the parent frame to pass in its url when
+turning on the annotator.
+- Feature: Enable syntax highlighting for .boa files (https://boa.cs.iastate.edu/) and bump Pygments
+dep to 2.12.0.
+- Code: Upgrade MFR's Dockerfile to be based off python3.6 and Debian buster.  Remove manual gosu
+installation and fetch from apt-get instead.  python3.6 is now the only supported python version.
+- Code: Migrate CI from TravisCI to Github Actions.
+
 20.0.1 (2020-10-21)
 ===================
 - Feature: Add flags to toggle logging of MFR events to specific Keen collections.

CONTRIBUTING.rst

@@ -23,8 +23,8 @@ Clone the repo:
 Configure development environment and install the development dependencies.
 
 .. note::
-    Python 3.5 or greater, `R`_, and `pspp`_ are required.
-    Python 3.6 is reccomended. It's recommended that a python version manager such as `pyenv`_ is used and that you use a virtual environment such as `pyenv-virtualenv`_ during development.
+    Python 3.6 or greater, `R`_, and `pspp`_ are required.
+    It's recommended that a python version manager such as `pyenv`_ is used and that you use a virtual environment such as `pyenv-virtualenv`_ during development.
 
 .. _R: https://www.r-project.org/
 .. _pspp: https://www.gnu.org/software/pspp/

README.md

@@ -8,15 +8,15 @@ A Python package for rendering files to HTML via an embeddable iframe.
 
 ### Compatibility
 
-MFR is compatible with Python 3.5 (tested up to 3.5.3) and 3.6.
+MFR is compatible with Python 3.6.
 
 ### Documentation
 
 Documentation available at: http://modular-file-renderer.readthedocs.io/en/latest/
 
 ### Setting up
 
-Install the latest version of python3.5.
+Install the latest version of python3.6.
 
 For MacOSX users:
 
@@ -33,12 +33,12 @@ apt-get install python3
 apt-get install pspp unoconv
 ```
 
-After installing python3.5, create the virtual environment with the following commands:
+After installing python3.6, create the virtual environment with the following commands:
 
 ```bash
 pip install virtualenv
 pip install virtualenvwrapper
-mkvirtualenv --python=`which python3.5` mfr
+mkvirtualenv --python=`which python3.6` mfr
 
 pip install setuptools==37.0.0
 pip install invoke==0.13.0
@@ -98,7 +98,7 @@ Interested in adding support for a new provider or file format? Check out the CO
 
 ### License
 
-Copyright 2013-2018 Center for Open Science
+Copyright 2013-2022 Center for Open Science
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

mfr/version.py

@@ -1 +1 @@
-__version__ = '20.0.1'
+__version__ = '22.0.0'

setup.py

@@ -30,7 +30,7 @@ def parse_requirements(requirements):
         'Natural Language :: English',
         'Intended Audience :: Developers',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: Apache Software License',
     ],