Drop support for EOL python 2 (#105)

* drop support for EOL pythons (python 2.7, 3.5)

* test with py3.10

* pre-commit autoupdate

* add pyupgrade to pre-commit hooks

Author: graingert

.pre-commit-config.yaml

@@ -6,9 +6,14 @@ repos:
     hooks:
     - id: black
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v3.4.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-yaml
     -   id: check-added-large-files
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v2.7.2
+    hooks:
+    -   id: pyupgrade
+        args: [--py36-plus]

.travis.yml

@@ -2,11 +2,11 @@
 language: python
 dist: bionic
 python:
-  - "2.7"
   - "3.6"
   - "3.7"
   - "3.8"
   - "3.9"
+  - "3.10-dev"
 
 install:
   - pip install tox tox-travis

docs/conf.py

@@ -1,5 +1,4 @@
 """Sphinx config."""
-# -*- coding: utf-8 -*-
 #
 # pytest-factoryboy documentation build configuration file, created by
 # sphinx-quickstart on Sun Apr  7 21:07:56 2013.
@@ -19,35 +18,35 @@
 import sys
 import os
 
-sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(0, os.path.abspath(".."))
 
 import pytest_factoryboy
 
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+# needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
+extensions = ["sphinx.ext.autodoc", "sphinx.ext.viewcode"]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+# source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = u'pytest-factoryboy'
-AUTHOR = 'Oleg Pidsadnyi, Anatoly Bubenkov and others'
-copyright = u'2015, ' + AUTHOR
+project = "pytest-factoryboy"
+AUTHOR = "Oleg Pidsadnyi, Anatoly Bubenkov and others"
+copyright = "2015, " + AUTHOR
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -60,170 +59,165 @@
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-#language = None
+# language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = ["_build"]
 
 # The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
+# default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
 
 
 # -- Options for HTML output ---------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = "default"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+# html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+# html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+# html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+# html_logo = None
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+# html_favicon = None
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+# html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+# html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_domain_indices = True
+# html_domain_indices = True
 
 # If false, no index is generated.
-#html_use_index = True
+# html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'pytest-factoryboy-doc'
+htmlhelp_basename = "pytest-factoryboy-doc"
 
 
 # -- Options for LaTeX output --------------------------------------------------
 
 latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
     #'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'pytest-factoryboy.tex', u'pytest-factoryboy Documentation', AUTHOR, 'manual'),
+    ("index", "pytest-factoryboy.tex", "pytest-factoryboy Documentation", AUTHOR, "manual"),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
 
 # If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False
 
 # If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
-#latex_domain_indices = True
+# latex_domain_indices = True
 
 
 # -- Options for manual page output --------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'pytest-factoryboy', u'pytest-factoryboy Documentation',
-     [AUTHOR], 1)
-]
+man_pages = [("index", "pytest-factoryboy", "pytest-factoryboy Documentation", [AUTHOR], 1)]
 
 # If true, show URL addresses after external links.
-#man_show_urls = False
+# man_show_urls = False
 
 
 # -- Options for Texinfo output ------------------------------------------------
@@ -232,16 +226,22 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'pytest-factoryboy', u'pytest-factoryboy Documentation',
-        AUTHOR, 'pytest-factoryboy', 'factory_boy integration the pytest runner.',
-        'Miscellaneous'),
+    (
+        "index",
+        "pytest-factoryboy",
+        "pytest-factoryboy Documentation",
+        AUTHOR,
+        "pytest-factoryboy",
+        "factory_boy integration the pytest runner.",
+        "Miscellaneous",
+    ),
 ]
 
 # Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
+# texinfo_appendices = []
 
 # If false, no module index is generated.
-#texinfo_domain_indices = True
+# texinfo_domain_indices = True
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
+# texinfo_show_urls = 'footnote'

pyproject.toml

@@ -1,3 +1,3 @@
 [tool.black]
 line-length = 120
-target-version = ['py27', 'py36', 'py37', 'py38']
+target-version = ['py36']

pytest_factoryboy/fixture.py

@@ -9,12 +9,7 @@
 import inflection
 import pytest
 
-from inspect import getmodule
-
-if sys.version_info > (3, 0):
-    from inspect import signature
-else:
-    from funcsigs import signature
+from inspect import getmodule, signature
 
 SEPARATOR = "__"
 
@@ -198,11 +193,11 @@ def model_fixture(request, factory_name):
     class Factory(factory_class):
         pass
 
-    Factory._meta.base_declarations = dict(
-        (k, v)
+    Factory._meta.base_declarations = {
+        k: v
         for k, v in Factory._meta.base_declarations.items()
         if not isinstance(v, factory.declarations.PostGenerationDeclaration)
-    )
+    }
     Factory._meta.post_declarations = factory.builder.DeclarationSet()
 
     kwargs = {}
@@ -329,7 +324,7 @@ def get_caller_module(depth=2):
     return module
 
 
-class LazyFixture(object):
+class LazyFixture:
     """Lazy fixture."""
 
     def __init__(self, fixture):
@@ -351,7 +346,7 @@ def evaluate(self, request):
         :return: evaluated fixture.
         """
         if callable(self.fixture):
-            kwargs = dict((arg, request.getfixturevalue(arg)) for arg in self.args)
+            kwargs = {arg: request.getfixturevalue(arg) for arg in self.args}
             return self.fixture(**kwargs)
         else:
             return request.getfixturevalue(self.fixture)

pytest_factoryboy/plugin.py

@@ -8,7 +8,7 @@ class CycleDetected(Exception):
     pass
 
 
-class Request(object):
+class Request:
     """PyTest FactoryBoy request."""
 
     def __init__(self):
@@ -30,7 +30,7 @@ def get_deps(self, request, fixture, deps=None):
         request = request.getfixturevalue("request")
 
         if deps is None:
-            deps = set([fixture])
+            deps = {fixture}
         if fixture == "request":
             return deps