sqa: sort imports with isort

.github/workflows/python-lint.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Install test dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pytest flake8 black ruff pylint polars pandas
+        pip install pytest flake8 black ruff isort pylint polars pandas
 
     - name: Test the code style
       run: |

Makefile

@@ -58,6 +58,7 @@ lint:
 	@black --check xlsxwriter/ examples/
 	@pylint xlsxwriter/*.py
 	@pylint --rcfile=examples/.pylintrc examples/*.py
+	@isort --check --diff --profile black xlsxwriter/ examples/
 
 tags:
 	$(Q)rm -f TAGS

examples/background.py

@@ -8,7 +8,6 @@
 #
 import xlsxwriter
 
-
 # Create an new Excel file and add a worksheet.
 workbook = xlsxwriter.Workbook("background.xlsx")
 worksheet = workbook.add_worksheet()

examples/chart_date_axis.py

@@ -8,6 +8,7 @@
 #
 
 from datetime import date
+
 import xlsxwriter
 
 workbook = xlsxwriter.Workbook("chart_date_axis.xlsx")

examples/chart_stock.py

@@ -6,6 +6,7 @@
 # Copyright 2013-2024, John McNamara, [email protected]
 #
 from datetime import datetime
+
 import xlsxwriter
 
 workbook = xlsxwriter.Workbook("chart_stock.xlsx")

examples/data_validate.py

@@ -12,6 +12,7 @@
 # Copyright 2013-2024, John McNamara, [email protected]
 #
 from datetime import date, time
+
 import xlsxwriter
 
 workbook = xlsxwriter.Workbook("data_validate.xlsx")

examples/datetimes.py

@@ -7,6 +7,7 @@
 # Copyright 2013-2024, John McNamara, [email protected]
 #
 from datetime import datetime
+
 import xlsxwriter
 
 # Create a workbook and add a worksheet.

examples/defined_name.py

@@ -10,7 +10,6 @@
 #
 import xlsxwriter
 
-
 workbook = xlsxwriter.Workbook("defined_name.xlsx")
 worksheet1 = workbook.add_worksheet()
 worksheet2 = workbook.add_worksheet()

examples/demo.py

@@ -7,7 +7,6 @@
 #
 import xlsxwriter
 
-
 # Create an new Excel file and add a worksheet.
 workbook = xlsxwriter.Workbook("demo.xlsx")
 worksheet = workbook.add_worksheet()

examples/django_simple.py

@@ -9,8 +9,10 @@
 # pylint: skip-file
 
 import io
+
 from django.http import HttpResponse
 from django.views.generic import View
+
 import xlsxwriter
 
 

examples/embedded_images.py

@@ -12,7 +12,6 @@
 #
 import xlsxwriter
 
-
 # Create an new Excel file and add a worksheet.
 workbook = xlsxwriter.Workbook("embedded_images.xlsx")
 worksheet = workbook.add_worksheet()

examples/http_server.py

@@ -9,8 +9,8 @@
 #
 
 import http.server
-import socketserver
 import io
+import socketserver
 
 import xlsxwriter
 

examples/images.py

@@ -8,7 +8,6 @@
 #
 import xlsxwriter
 
-
 # Create an new Excel file and add a worksheet.
 workbook = xlsxwriter.Workbook("images.xlsx")
 worksheet = workbook.add_worksheet()

examples/images_bytesio.py

@@ -10,7 +10,6 @@
 from io import BytesIO
 from urllib.request import urlopen
 
-
 import xlsxwriter
 
 # Create the workbook and add a worksheet.

examples/inheritance1.py

@@ -7,8 +7,7 @@
 # Copyright 2013-2024, John McNamara, [email protected]
 #
 from xlsxwriter.workbook import Workbook
-from xlsxwriter.worksheet import Worksheet
-from xlsxwriter.worksheet import convert_cell_args
+from xlsxwriter.worksheet import Worksheet, convert_cell_args
 
 
 class MyWorksheet(Worksheet):

examples/inheritance2.py

@@ -15,8 +15,7 @@
 # Copyright 2013-2024, John McNamara, [email protected]
 #
 from xlsxwriter.workbook import Workbook
-from xlsxwriter.worksheet import Worksheet
-from xlsxwriter.worksheet import convert_cell_args
+from xlsxwriter.worksheet import Worksheet, convert_cell_args
 
 
 def excel_string_width(string):

examples/merge1.py

@@ -7,7 +7,6 @@
 #
 import xlsxwriter
 
-
 # Create an new Excel file and add a worksheet.
 workbook = xlsxwriter.Workbook("merge1.xlsx")
 worksheet = workbook.add_worksheet()

examples/merge_rich_string.py

@@ -8,7 +8,6 @@
 #
 import xlsxwriter
 
-
 # Create an new Excel file and add a worksheet.
 workbook = xlsxwriter.Workbook("merge_rich_string.xlsx")
 worksheet = workbook.add_worksheet()

examples/pandas_chart.py

@@ -9,7 +9,6 @@
 
 import pandas as pd
 
-
 # Create a Pandas dataframe from some data.
 df = pd.DataFrame({"Data": [10, 20, 30, 20, 15, 30, 45]})
 

examples/pandas_chart_line.py

@@ -8,6 +8,7 @@
 #
 
 import random
+
 import pandas as pd
 
 # Create some sample data to plot.

examples/pandas_conditional_format.py

@@ -9,7 +9,6 @@
 
 import pandas as pd
 
-
 # Create a Pandas dataframe from some data.
 df = pd.DataFrame({"Data": [10, 20, 30, 20, 15, 30, 45]})
 

examples/pandas_datetime.py

@@ -7,7 +7,8 @@
 # Copyright 2013-2024, John McNamara, [email protected]
 #
 
-from datetime import datetime, date
+from datetime import date, datetime
+
 import pandas as pd
 
 # Create a Pandas dataframe from some datetime data.

examples/pandas_multiple.py

@@ -9,7 +9,6 @@
 
 import pandas as pd
 
-
 # Create some Pandas dataframes from some data.
 df1 = pd.DataFrame({"Data": [11, 12, 13, 14]})
 df2 = pd.DataFrame({"Data": [21, 22, 23, 24]})

examples/pandas_percentage.py

@@ -9,7 +9,6 @@
 
 import pandas as pd
 
-
 # Create a Pandas dataframe from some data.
 df = pd.DataFrame({"Names": ["Anna", "Arek", "Arun"], "Grade": ["100%", "70%", "85%"]})
 

examples/pandas_positioning.py

@@ -9,7 +9,6 @@
 
 import pandas as pd
 
-
 # Create some Pandas dataframes from some data.
 df1 = pd.DataFrame({"Data": [11, 12, 13, 14]})
 df2 = pd.DataFrame({"Data": [21, 22, 23, 24]})

examples/pandas_simple.py

@@ -9,7 +9,6 @@
 
 import pandas as pd
 
-
 # Create a Pandas dataframe from some data.
 df = pd.DataFrame({"Data": [10, 20, 30, 20, 15, 30, 45]})
 

examples/polars_chart.py

@@ -8,6 +8,7 @@
 #
 
 import polars as pl
+
 import xlsxwriter
 
 df = pl.DataFrame({"Data": [10, 20, 30, 20, 15, 30, 45]})

examples/polars_format_custom.py

@@ -8,6 +8,7 @@
 #
 
 from datetime import date
+
 import polars as pl
 
 # Create a Pandas dataframe with some sample data.

examples/polars_format_default.py

@@ -8,6 +8,7 @@
 #
 
 from datetime import date
+
 import polars as pl
 
 # Create a Pandas dataframe with some sample data.

examples/polars_multiple.py

@@ -8,6 +8,7 @@
 #
 
 import polars as pl
+
 import xlsxwriter
 
 # Create some Polars dataframes from some data.

examples/polars_positioning.py

@@ -8,6 +8,7 @@
 #
 
 import polars as pl
+
 import xlsxwriter
 
 # Create some Polars dataframes from some data.

examples/polars_xlsxwriter.py

@@ -7,6 +7,7 @@
 #
 
 import polars as pl
+
 import xlsxwriter
 
 with xlsxwriter.Workbook("polars_xlsxwriter.xlsx") as workbook:

examples/tutorial3.py

@@ -10,6 +10,7 @@
 # Copyright 2013-2024, John McNamara, [email protected]
 #
 from datetime import datetime
+
 import xlsxwriter
 
 # Create a workbook and add a worksheet.

examples/user_types1.py

@@ -7,6 +7,7 @@
 # Copyright 2013-2024, John McNamara, [email protected]
 #
 import uuid
+
 import xlsxwriter
 
 

examples/user_types2.py

@@ -7,6 +7,7 @@
 # Copyright 2013-2024, John McNamara, [email protected]
 #
 import math
+
 import xlsxwriter
 
 

examples/vba_extract.py

@@ -10,8 +10,7 @@
 #
 
 import sys
-from zipfile import ZipFile
-from zipfile import BadZipFile
+from zipfile import BadZipFile, ZipFile
 
 
 def extract_file(xlsm_zip, filename):

xlsxwriter/chart.py

@@ -6,18 +6,20 @@
 # Copyright 2013-2024, John McNamara, [email protected]
 #
 
-import re
 import copy
+import re
 from warnings import warn
 
-from .shape import Shape
 from . import xmlwriter
-from .utility import _get_rgb_color
-from .utility import xl_rowcol_to_cell
-from .utility import xl_range_formula
-from .utility import _supported_datetime
-from .utility import _datetime_to_excel_datetime
-from .utility import quote_sheetname
+from .shape import Shape
+from .utility import (
+    _datetime_to_excel_datetime,
+    _get_rgb_color,
+    _supported_datetime,
+    quote_sheetname,
+    xl_range_formula,
+    xl_rowcol_to_cell,
+)
 
 
 class Chart(xmlwriter.XMLwriter):

xlsxwriter/chart_bar.py

@@ -7,6 +7,7 @@
 #
 
 from warnings import warn
+
 from . import chart
 
 

xlsxwriter/chart_doughnut.py

@@ -7,6 +7,7 @@
 #
 
 from warnings import warn
+
 from . import chart_pie
 
 

xlsxwriter/chart_pie.py

@@ -7,6 +7,7 @@
 #
 
 from warnings import warn
+
 from . import chart
 
 

xlsxwriter/chart_scatter.py

@@ -7,6 +7,7 @@
 #
 
 from warnings import warn
+
 from . import chart
 
 

xlsxwriter/comments.py

@@ -7,8 +7,7 @@
 #
 
 from . import xmlwriter
-from .utility import _preserve_whitespace
-from .utility import xl_rowcol_to_cell
+from .utility import _preserve_whitespace, xl_rowcol_to_cell
 
 
 class Comments(xmlwriter.XMLwriter):

xlsxwriter/contenttypes.py

@@ -7,6 +7,7 @@
 #
 
 import copy
+
 from . import xmlwriter
 
 # Long namespace strings used in the class.

xlsxwriter/format.py

@@ -8,6 +8,7 @@
 
 # Package imports.
 from warnings import warn
+
 from . import xmlwriter