Skip to content
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

isort upgrade 5.11.5 #3445

Closed
wants to merge 2 commits into from
Closed
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
5 changes: 3 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ repos:
# - id: check-docstring-first # We can enable this rule once models.py is simplified
- id: check-yaml

- repo: https://github.com/pre-commit/mirrors-isort
rev: v4.3.21
- repo: https://github.com/pycqa/isort
rev: 5.11.5
hooks:
- id: isort
name: isort (python)

- repo: https://github.com/psf/black
rev: 22.3.0
Expand Down
2 changes: 1 addition & 1 deletion api/tests/test_imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ class ImportTestCase(TestCase):
def test_imports(self):
# Make sure we can import the api tests
import tests.management.commands.test_post_downloads_summary
import tests.test_sentry_middleware
import tests.views.test_api_general
import tests.views.test_compendia
import tests.views.test_dataset
import tests.views.test_dataset_stats
import tests.views.test_processor
import tests.views.test_qn_target
import tests.views.test_search
import tests.test_sentry_middleware
import tests.views.test_stats
55 changes: 28 additions & 27 deletions foreman/tests/test_imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,34 @@
class ImportTestCase(TestCase):
def test_imports(self):
# Make sure we can import the foreman tests
import tests.foreman.management.commands.test_correct_affy_cdfs
import tests.foreman.management.commands.test_create_compendia
import tests.foreman.management.commands.test_create_missing_downloader_jobs
import tests.foreman.management.commands.test_create_missing_processor_jobs
import tests.foreman.management.commands.test_create_quantpendia
import tests.foreman.management.commands.test_import_external_sample_attributes
import tests.foreman.management.commands.test_import_external_sample_keywords
import tests.foreman.management.commands.test_organism_shepherd
import tests.foreman.management.commands.test_rerun_salmon_old_samples
import tests.foreman.management.commands.test_retry_samples
import tests.foreman.management.commands.test_run_tximport
import tests.foreman.management.commands.test_update_experiment_metadata
import tests.foreman.test_downloader_job_manager
import tests.foreman.test_end_to_end
import tests.foreman.test_job_control
import tests.foreman.test_job_requeuing
import tests.foreman.test_processor_job_manager
import tests.foreman.test_survey_job_manager
import tests.surveyor.management.commands.test_unsurvey
import tests.surveyor.test_array_express
import tests.surveyor.test_external_source
import tests.surveyor.test_geo
import tests.surveyor.test_harmony
import tests.surveyor.test_sra
import tests.surveyor.test_surveyor
import tests.surveyor.test_transcriptome_index
import tests.surveyor.test_utils

import data_refinery_foreman.foreman.management.commands.check_computed_files
import data_refinery_foreman.foreman.management.commands.check_missing_results
import data_refinery_foreman.foreman.management.commands.correct_affy_cdfs
Expand Down Expand Up @@ -32,30 +60,3 @@ def test_imports(self):
import data_refinery_foreman.foreman.management.commands.update_experiment_metadata
import data_refinery_foreman.foreman.management.commands.update_sample_metadata
import data_refinery_foreman.foreman.utils
import tests.foreman.management.commands.test_correct_affy_cdfs
import tests.foreman.management.commands.test_create_compendia
import tests.foreman.management.commands.test_create_missing_downloader_jobs
import tests.foreman.management.commands.test_create_missing_processor_jobs
import tests.foreman.management.commands.test_create_quantpendia
import tests.foreman.management.commands.test_import_external_sample_attributes
import tests.foreman.management.commands.test_import_external_sample_keywords
import tests.foreman.management.commands.test_organism_shepherd
import tests.foreman.management.commands.test_rerun_salmon_old_samples
import tests.foreman.management.commands.test_retry_samples
import tests.foreman.management.commands.test_run_tximport
import tests.foreman.management.commands.test_update_experiment_metadata
import tests.foreman.test_downloader_job_manager
import tests.foreman.test_end_to_end
import tests.foreman.test_job_control
import tests.foreman.test_job_requeuing
import tests.foreman.test_processor_job_manager
import tests.foreman.test_survey_job_manager
import tests.surveyor.management.commands.test_unsurvey
import tests.surveyor.test_array_express
import tests.surveyor.test_external_source
import tests.surveyor.test_geo
import tests.surveyor.test_harmony
import tests.surveyor.test_sra
import tests.surveyor.test_surveyor
import tests.surveyor.test_utils
import tests.surveyor.test_transcriptome_index
10 changes: 6 additions & 4 deletions workers/tests/downloaders/test_imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ class ImportTestCase(TestCase):
@tag("downloaders")
def test_downloader_imports(self):
# Make sure we can import the downloader tests.
from tests.downloaders import test_array_express
from tests.downloaders import test_geo
from tests.downloaders import test_sra
from tests.downloaders import test_transcriptome_index
from tests.downloaders import (
test_array_express,
test_geo,
test_sra,
test_transcriptome_index,
)
4 changes: 2 additions & 2 deletions workers/tests/processors/test_smasher.py
Original file line number Diff line number Diff line change
Expand Up @@ -1240,10 +1240,10 @@ def test_quant_sf_only_smash(self):
def test_sanity_imports(self):
"""Sci imports can be tricky, make sure this works."""

import numpy # noqa
import scipy # noqa
import matplotlib # noqa
import numpy # noqa
import pandas # noqa
import scipy # noqa
import sklearn # noqa
import sympy # noqa

Expand Down
Loading