Skip to content

Commit 4f2a9bc

Browse files
committed
Remove dependency xlsxwriter
1 parent 1ffed8a commit 4f2a9bc

3 files changed

Lines changed: 10 additions & 11 deletions

File tree

.github/workflows/python_jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
- name: Install dependencies with conda
3737
run: |
3838
# conda install numpy -y
39-
# conda install conda-build setuptools setuptools_scm pandas pyqt xlsxwriter openpyxl -y
39+
# conda install conda-build setuptools setuptools_scm pandas pyqt openpyxl -y
4040
# Limit cx_freeze to a functioning version. Each new release
4141
# seems to cause issues with the dlls for mkl and numpy
4242
# conda install -c conda-forge "cx_freeze>=6.14,<6.15" -y
4343
4444
# There is an issue where python 3.12 always seems to be pinned as a dependency
4545
# Including the actually used python version in the install command works
46-
conda install python=${{ matrix.python-version }} numpy conda-build setuptools setuptools_scm pandas pyqt qttools xlsxwriter openpyxl cx_freeze -c conda-forge -y
46+
conda install python=${{ matrix.python-version }} numpy conda-build setuptools setuptools_scm pandas pyqt qttools openpyxl cx_freeze -c conda-forge -y
4747
4848
- name: Prepare bdist_msi
4949
if: runner.os == 'Windows' && contains(fromJson('["3.13","3.14"]'), matrix.python-version)

setup_d2t_exe.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@
147147
'idna',
148148
'idna.idnadata',
149149
'openpyxl',
150-
'xlsxwriter',
151150
],
152151
'zip_include_packages': ['*'], # reduze file size
153152
'zip_exclude_packages': [
@@ -156,7 +155,6 @@
156155
],
157156
'includes': ['geopy',
158157
'openpyxl',
159-
'xlsxwriter',
160158
],
161159
'excludes': ['adodbapi',
162160
'alabaster'

setup_exe.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,18 +158,18 @@
158158
'asyncio',
159159
'pandas.plotting._matplotlib',
160160
'openpyxl',
161-
'xlsxwriter',
162161
],
163162
# 'namespace_packages': ['mpl_toolkits'],
164163
'zip_include_packages': ['*'], # reduze file size
165164
'zip_exclude_packages': [
166165
'lpagg',
167166
'PIL',
168167
'matplotlib',
169-
# 'pandas', 'PyQt5',
168+
'pandas',
169+
# 'PyQt5',
170170
],
171171
'includes': ['openpyxl',
172-
'xlsxwriter',
172+
'PIL',
173173
],
174174
'excludes': ['adodbapi',
175175
'alabaster'
@@ -255,10 +255,12 @@
255255
],
256256
'include_files': [
257257
# os.path.join(dlls, 'libiomp5md.dll'),
258-
# os.path.join(dlls, 'mkl_core.2.dll'),
259-
# os.path.join(dlls, 'mkl_def.2.dll'),
260-
os.path.join(dlls, 'mkl_avx2.2.dll'),
258+
os.path.join(dlls, 'mkl_core.2.dll'),
259+
os.path.join(dlls, 'mkl_def.2.dll'),
260+
os.path.join(dlls, 'mkl_vml_avx2.2.dll'),
261+
os.path.join(dlls, 'mkl_vml_def.2.dll'),
261262
os.path.join(dlls, 'mkl_intel_thread.2.dll'),
263+
os.path.join(dlls, 'mkl_avx2.2.dll'),
262264
os.path.join(dlls, 'mkl_sequential.2.dll'),
263265
os.path.join(dlls, 'vcruntime140.dll'),
264266
os.path.join(dlls, 'msvcp140_1.dll'),
@@ -268,7 +270,6 @@
268270
r'./README.md',
269271
],
270272
'include_msvcr': True, # Microsoft Visual C++
271-
272273
},
273274
'bdist_msi': {'data': {"Shortcut": shortcut_table},
274275
'summary_data': {'author': author,

0 commit comments

Comments
 (0)