Skip to content

Remove testing for Python 3.4 #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ if [[ ${PYTHON_VERSION} == 2.7 ]]; then
fire/inspectutils_test.py \
fire/test_components_py3.py;
elif [[ ${PYTHON_VERSION} == 3.7 ]]; then
pytype;
pytype -x fire/test_components_py3.py;
fi

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-latest
strategy:
matrix:
python-version: [2.7, 3.4, 3.5, 3.7, 3.8, 3.9]
python-version: [2.7, 3.5, 3.7, 3.8, 3.9]

steps:
# Checkout the repo.
Expand Down
2 changes: 1 addition & 1 deletion fire/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def import_from_file_path(path):
spec.loader.exec_module(module) # pytype: disable=attribute-error

else:
import imp # pylint: disable=g-import-not-at-top,import-outside-toplevel
import imp # pylint: disable=g-import-not-at-top,import-outside-toplevel,deprecated-module
module = imp.load_source(module_name, path)

return module, module_name
Expand Down
4 changes: 2 additions & 2 deletions fire/custom_descriptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@ def GetStringTypeDescription(obj, available_space, line_length):

def GetSummary(obj, available_space, line_length):
obj_type_name = type(obj).__name__
if obj_type_name in CUSTOM_DESC_SUM_FN_DICT.keys():
if obj_type_name in CUSTOM_DESC_SUM_FN_DICT:
return CUSTOM_DESC_SUM_FN_DICT.get(obj_type_name)[0](obj, available_space,
line_length)
return None


def GetDescription(obj, available_space, line_length):
obj_type_name = type(obj).__name__
if obj_type_name in CUSTOM_DESC_SUM_FN_DICT.keys():
if obj_type_name in CUSTOM_DESC_SUM_FN_DICT:
return CUSTOM_DESC_SUM_FN_DICT.get(obj_type_name)[1](obj, available_space,
line_length)
return None
4 changes: 2 additions & 2 deletions fire/main_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ class MainModuleFileTest(testutils.BaseTestCase):

def setUp(self):
super(MainModuleFileTest, self).setUp()
self.file = tempfile.NamedTemporaryFile(suffix='.py')
self.file = tempfile.NamedTemporaryFile(suffix='.py') # pylint: disable=consider-using-with
self.file.write(b'class Foo:\n def double(self, n):\n return 2 * n\n')
self.file.flush()

self.file2 = tempfile.NamedTemporaryFile()
self.file2 = tempfile.NamedTemporaryFile() # pylint: disable=consider-using-with

def testFileNameFire(self):
# Confirm that the file is correctly imported and doubles the number.
Expand Down
2 changes: 1 addition & 1 deletion pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ enable=indexing-exception,old-raise-syntax
# Disable the message, report, category or checker with the given id(s). You
# can either give multiple identifier separated by comma (,) or put this option
# multiple time.
disable=design,similarities,no-self-use,attribute-defined-outside-init,locally-disabled,star-args,pointless-except,bad-option-value,global-statement,fixme,suppressed-message,useless-suppression,locally-enabled,file-ignored,wrong-import-order,useless-object-inheritance,no-else-return,super-with-arguments,raise-missing-from
disable=design,similarities,no-self-use,attribute-defined-outside-init,locally-disabled,star-args,pointless-except,bad-option-value,global-statement,fixme,suppressed-message,useless-suppression,locally-enabled,file-ignored,wrong-import-order,useless-object-inheritance,no-else-return,super-with-arguments,raise-missing-from,consider-using-f-string,unspecified-encoding


[REPORTS]
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
Expand Down