Merge: Remove python 2.7 artefacts

Remove python 2.7 artefacts

Author: insspb

docs/conf.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # flask-script documentation build configuration file, created by
 # sphinx-quickstart on Wed Jun 23 08:26:41 2010.
 #
@@ -40,8 +38,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Flask-MongoEngine'
-copyright = u'2010-2020, Streetlife and others'
+project = 'Flask-MongoEngine'
+copyright = '2010-2020, Streetlife and others'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -183,8 +181,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'flask-mongoengine.tex', u'Flask-MongoEngine Documentation',
-   u'Ross Lawley', 'manual'),
+  ('index', 'flask-mongoengine.tex', 'Flask-MongoEngine Documentation',
+   'Ross Lawley', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -216,6 +214,6 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'flask-mongoengine', u'Flask-MongoEngine Documentation',
-     [u'Ross Lawley', u'Dan Jacob', u'Marat Khabibullin'], 1)
+    ('index', 'flask-mongoengine', 'Flask-MongoEngine Documentation',
+     ['Ross Lawley', 'Dan Jacob', 'Marat Khabibullin'], 1)
 ]

docs/index.rst

@@ -170,7 +170,7 @@ flask-mongoengine automatically generates WTForms from MongoEngine models::
         lang = db.StringField(max_length=3)
 
     class Post(db.Document):
-        title = db.StringField(max_length=120, required=True, validators=[validators.InputRequired(message=u'Missing title.'),])
+        title = db.StringField(max_length=120, required=True, validators=[validators.InputRequired(message='Missing title.'),])
         author = db.ReferenceField(User)
         tags = db.ListField(db.StringField(max_length=30))
         content = db.EmbeddedDocumentField(Content)

examples/simpleapp/app.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import datetime
 import os
 import sys

flask_mongoengine/__init__.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-
 import inspect
 
 import mongoengine

flask_mongoengine/pagination.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import math
 
 from flask import abort

setup.py

@@ -1,4 +1,3 @@
-import io
 import os
 from setuptools import setup
 
@@ -10,7 +9,7 @@
 
 # Load index.rst as long_description
 doc_path = os.path.join(os.path.dirname(__file__), "docs", "index.rst")
-long_description = io.open(doc_path, encoding="utf-8").read()
+long_description = open(doc_path, encoding="utf-8").read()
 
 # Stops exit traceback on tests
 try:
@@ -33,7 +32,7 @@ def get_version(version_tuple):
 version_line = list(filter(lambda l: l.startswith("VERSION"), open(init)))[0]
 version = get_version(eval(version_line.split("=")[-1]))
 
-test_requirements = ["coverage", "nose", "rednose"]
+test_requirements = ["coverage", "nose", "pytest", "pytest-cov"]
 
 setup(
     name="flask-mongoengine",
@@ -42,7 +41,6 @@ def get_version(version_tuple):
     license="BSD",
     author="Ross Lawley",
     author_email="[email protected]",
-    test_suite="nose.collector",
     zip_safe=False,
     platforms="any",
     install_requires=[
@@ -63,11 +61,15 @@ def get_version(version_tuple):
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
+        "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: Implementation :: PyPy"
+        "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
         "Topic :: Software Development :: Libraries :: Python Modules",
+        "Framework :: Flask",
     ],
 )