diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh index 1f9ed766..111257ae 100755 --- a/.github/scripts/build.sh +++ b/.github/scripts/build.sh @@ -17,7 +17,7 @@ # Exit when any command fails. set -e -PYTHON_VERSION=${PYTHON_VERSION:-2.7} +PYTHON_VERSION=${PYTHON_VERSION:-3.7} pip install -U -r .github/scripts/requirements.txt python setup.py develop diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f5562820..7f5225c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.5", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] steps: # Checkout the repo. diff --git a/fire/__init__.py b/fire/__init__.py index fae18489..742b03ac 100644 --- a/fire/__init__.py +++ b/fire/__init__.py @@ -14,10 +14,6 @@ """The Python Fire module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire.core import Fire __all__ = ['Fire'] diff --git a/fire/__main__.py b/fire/__main__.py index 9d8227ad..15a9d6c8 100644 --- a/fire/__main__.py +++ b/fire/__main__.py @@ -18,10 +18,6 @@ This allows using Fire with third-party libraries without modifying their code. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import importlib import os import sys diff --git a/fire/completion_test.py b/fire/completion_test.py index 582e5bbc..5bafc279 100644 --- a/fire/completion_test.py +++ b/fire/completion_test.py @@ -14,10 +14,6 @@ """Tests for the completion module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import completion from fire import test_components as tc from fire import testutils diff --git a/fire/console/console_io.py b/fire/console/console_io.py index 3d3b9f81..ec0858d9 100644 --- a/fire/console/console_io.py +++ b/fire/console/console_io.py @@ -15,10 +15,6 @@ """General console printing utilities used by the Cloud SDK.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import os import signal import subprocess diff --git a/fire/core.py b/fire/core.py index fada01b1..0a6dae7d 100644 --- a/fire/core.py +++ b/fire/core.py @@ -49,10 +49,6 @@ def main(argv): --trace: Get the Fire Trace for the command. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import inspect import json import os diff --git a/fire/core_test.py b/fire/core_test.py index 75b76998..b9033c22 100644 --- a/fire/core_test.py +++ b/fire/core_test.py @@ -14,10 +14,6 @@ """Tests for the core module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import core from fire import test_components as tc from fire import testutils diff --git a/fire/custom_descriptions.py b/fire/custom_descriptions.py index 266671f1..f7df90b0 100644 --- a/fire/custom_descriptions.py +++ b/fire/custom_descriptions.py @@ -36,10 +36,6 @@ descriptions for primitive typed values. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import formatting import six diff --git a/fire/custom_descriptions_test.py b/fire/custom_descriptions_test.py index 79d7c7a1..6cff2d5d 100644 --- a/fire/custom_descriptions_test.py +++ b/fire/custom_descriptions_test.py @@ -14,10 +14,6 @@ """Tests for custom description module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import custom_descriptions from fire import testutils diff --git a/fire/decorators.py b/fire/decorators.py index b2e9b322..eb5b0d20 100644 --- a/fire/decorators.py +++ b/fire/decorators.py @@ -18,10 +18,6 @@ command line arguments to client code. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import inspect FIRE_METADATA = 'FIRE_METADATA' diff --git a/fire/decorators_test.py b/fire/decorators_test.py index cc7d6203..a316b79f 100644 --- a/fire/decorators_test.py +++ b/fire/decorators_test.py @@ -14,10 +14,6 @@ """Tests for the decorators module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import core from fire import decorators from fire import testutils diff --git a/fire/docstrings.py b/fire/docstrings.py index 1cfadea9..2d7c7e63 100644 --- a/fire/docstrings.py +++ b/fire/docstrings.py @@ -49,10 +49,6 @@ - "True | False" indicates bool type. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import collections import enum import re diff --git a/fire/docstrings_fuzz_test.py b/fire/docstrings_fuzz_test.py index 7609f4f8..66be8006 100644 --- a/fire/docstrings_fuzz_test.py +++ b/fire/docstrings_fuzz_test.py @@ -14,10 +14,6 @@ """Fuzz tests for the docstring parser module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import docstrings from fire import testutils diff --git a/fire/docstrings_test.py b/fire/docstrings_test.py index 0d6e5d18..ce516944 100644 --- a/fire/docstrings_test.py +++ b/fire/docstrings_test.py @@ -14,10 +14,6 @@ """Tests for fire docstrings module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import docstrings from fire import testutils diff --git a/fire/fire_test.py b/fire/fire_test.py index 8b904c29..6b9a2fa2 100644 --- a/fire/fire_test.py +++ b/fire/fire_test.py @@ -14,10 +14,6 @@ """Tests for the fire module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import os import sys diff --git a/fire/formatting.py b/fire/formatting.py index faef8047..68484c27 100644 --- a/fire/formatting.py +++ b/fire/formatting.py @@ -14,10 +14,6 @@ """Formatting utilities for use in creating help text.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import formatting_windows # pylint: disable=unused-import import termcolor diff --git a/fire/formatting_test.py b/fire/formatting_test.py index 05a88c49..e0f6699d 100644 --- a/fire/formatting_test.py +++ b/fire/formatting_test.py @@ -14,10 +14,6 @@ """Tests for formatting.py.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import formatting from fire import testutils diff --git a/fire/formatting_windows.py b/fire/formatting_windows.py index ce0f677d..f8241eaa 100644 --- a/fire/formatting_windows.py +++ b/fire/formatting_windows.py @@ -14,10 +14,6 @@ """This module is used for enabling formatting on Windows.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import ctypes import os import platform diff --git a/fire/helptext.py b/fire/helptext.py index 6e7fbb07..93072897 100644 --- a/fire/helptext.py +++ b/fire/helptext.py @@ -29,10 +29,6 @@ information. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import collections import itertools import sys diff --git a/fire/helptext_test.py b/fire/helptext_test.py index 404d9812..9a0f4f6d 100644 --- a/fire/helptext_test.py +++ b/fire/helptext_test.py @@ -14,10 +14,6 @@ """Tests for the helptext module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import os import sys import textwrap diff --git a/fire/inspectutils.py b/fire/inspectutils.py index 15f32f91..ca51a9a5 100644 --- a/fire/inspectutils.py +++ b/fire/inspectutils.py @@ -14,10 +14,6 @@ """Inspection utility functions for Python Fire.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import inspect import sys import types diff --git a/fire/inspectutils_test.py b/fire/inspectutils_test.py index ea8eb0e2..bb62f402 100644 --- a/fire/inspectutils_test.py +++ b/fire/inspectutils_test.py @@ -14,10 +14,6 @@ """Tests for the inspectutils module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import os import unittest diff --git a/fire/interact.py b/fire/interact.py index 7df32841..7bdeb9a7 100644 --- a/fire/interact.py +++ b/fire/interact.py @@ -20,10 +20,6 @@ InteractiveConsole class. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import inspect diff --git a/fire/interact_test.py b/fire/interact_test.py index 29fa7597..99cde285 100644 --- a/fire/interact_test.py +++ b/fire/interact_test.py @@ -14,10 +14,6 @@ """Tests for the interact module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import interact from fire import testutils diff --git a/fire/parser.py b/fire/parser.py index bdf3cdbf..c4708455 100644 --- a/fire/parser.py +++ b/fire/parser.py @@ -14,10 +14,6 @@ """Provides parsing functionality used by Python Fire.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import argparse import ast import sys diff --git a/fire/parser_fuzz_test.py b/fire/parser_fuzz_test.py index af0be038..38e17725 100644 --- a/fire/parser_fuzz_test.py +++ b/fire/parser_fuzz_test.py @@ -14,10 +14,6 @@ """Fuzz tests for the parser module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import parser from fire import testutils from hypothesis import example diff --git a/fire/parser_test.py b/fire/parser_test.py index 8aeabc61..a404eea2 100644 --- a/fire/parser_test.py +++ b/fire/parser_test.py @@ -14,10 +14,6 @@ """Tests for the parser module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import parser from fire import testutils diff --git a/fire/test_components.py b/fire/test_components.py index 5fcb056e..e50f647c 100644 --- a/fire/test_components.py +++ b/fire/test_components.py @@ -14,10 +14,6 @@ """This module has components that are used for testing Python Fire.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import collections import enum import functools diff --git a/fire/test_components_bin.py b/fire/test_components_bin.py index fbb41952..62afdf11 100644 --- a/fire/test_components_bin.py +++ b/fire/test_components_bin.py @@ -17,10 +17,6 @@ This file is useful for replicating test results manually. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import fire from fire import test_components diff --git a/fire/test_components_test.py b/fire/test_components_test.py index f35d7ab5..531f882c 100644 --- a/fire/test_components_test.py +++ b/fire/test_components_test.py @@ -14,10 +14,6 @@ """Tests for the test_components module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import test_components as tc from fire import testutils diff --git a/fire/testutils.py b/fire/testutils.py index 5f875147..76faa3f4 100644 --- a/fire/testutils.py +++ b/fire/testutils.py @@ -14,10 +14,6 @@ """Utilities for Python Fire's tests.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import contextlib import os import re diff --git a/fire/testutils_test.py b/fire/testutils_test.py index ad604193..0999a4c8 100644 --- a/fire/testutils_test.py +++ b/fire/testutils_test.py @@ -14,10 +14,6 @@ """Test the test utilities for Fire's tests.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import sys from fire import testutils diff --git a/fire/trace.py b/fire/trace.py index 4c9674e3..2145186e 100644 --- a/fire/trace.py +++ b/fire/trace.py @@ -25,10 +25,6 @@ component will be None. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import shlex from fire import inspectutils diff --git a/fire/trace_test.py b/fire/trace_test.py index 1621a593..1f858f5e 100644 --- a/fire/trace_test.py +++ b/fire/trace_test.py @@ -14,10 +14,6 @@ """Tests for the trace module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from fire import testutils from fire import trace diff --git a/fire/value_types.py b/fire/value_types.py index c0a137fd..b2d0a0b3 100644 --- a/fire/value_types.py +++ b/fire/value_types.py @@ -14,10 +14,6 @@ """Types of values.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import inspect from fire import inspectutils diff --git a/setup.py b/setup.py index 24e0e325..f861f9a5 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ 'python-Levenshtein', ] -VERSION = '0.6.0' +VERSION = '0.7.0' URL = 'https://github.com/google/python-fire' setup( @@ -63,11 +63,7 @@ 'License :: OSI Approved :: Apache Software License', 'Programming Language :: Python', - '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', 'Programming Language :: Python :: 3.9',