Skip to content

Commit

Permalink
Remove future imports now that we've dropped support for Python 2 (#539)
Browse files Browse the repository at this point in the history
* Remove future imports now that we've dropped support for Python 2
  * Keep future imports for use in MemberVisible
* Drop support for Python 3.5
* Remove indications of support for Python <3.7 and bump version number.
  • Loading branch information
dbieber authored Sep 20, 2024
1 parent a59f6ba commit 8b063b9
Show file tree
Hide file tree
Showing 37 changed files with 3 additions and 143 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions fire/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
4 changes: 0 additions & 4 deletions fire/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/completion_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/console/console_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/core_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/custom_descriptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions fire/custom_descriptions_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions fire/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 0 additions & 4 deletions fire/decorators_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/docstrings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/docstrings_fuzz_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions fire/docstrings_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions fire/fire_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions fire/formatting.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions fire/formatting_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions fire/formatting_windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/helptext.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/helptext_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/inspectutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/inspectutils_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions fire/interact.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
InteractiveConsole class.
"""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import inspect


Expand Down
4 changes: 0 additions & 4 deletions fire/interact_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions fire/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/parser_fuzz_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/parser_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions fire/test_components.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/test_components_bin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions fire/test_components_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions fire/testutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/testutils_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/trace.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions fire/trace_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions fire/value_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 8b063b9

Please sign in to comment.