From 6b91494b0ee28fd5d623ead650f93897d560c018 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 14:30:28 +0000 Subject: [PATCH 1/4] depen update(deps): update openpyxl requirement Updates the requirements on [openpyxl](https://bitbucket.org/openpyxl/openpyxl) to permit the latest version. - [Commits](https://bitbucket.org/openpyxl/openpyxl/commits) Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0b88cc4..3544db1 100644 --- a/setup.py +++ b/setup.py @@ -83,5 +83,5 @@ def find_version(*file_paths): # your project is installed. For an analysis of "install_requires" vs pip's # requirements files see: # https://packaging.python.org/en/latest/requirements.html - install_requires=['openpyxl>=2.5,<3.0.3', 'colour>=0.1.5,<0.2', 'jsonschema', 'xlrd>=1.0.0,<1.3.0', 'pandas<1.1.0'] + install_requires=['openpyxl>=2.5,<3.0.5', 'colour>=0.1.5,<0.2', 'jsonschema', 'xlrd>=1.0.0,<1.3.0', 'pandas<1.1.0'] ) From cf1be6bf4ae5e2fbc7ff385b39dd59be220c3b15 Mon Sep 17 00:00:00 2001 From: Adi Date: Fri, 26 Jun 2020 22:41:15 +0300 Subject: [PATCH 2/4] Hardcoded colors hex values in utils.colors instead of relying on values from openpyxl since they were removed in openpyxl 3.0.4 --- styleframe/utils.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/styleframe/utils.py b/styleframe/utils.py index b03765e..977f287 100644 --- a/styleframe/utils.py +++ b/styleframe/utils.py @@ -1,5 +1,4 @@ import re -from openpyxl.styles import colors as op_colors HEX_REGEX = re.compile(r'^([A-Fa-f0-9]{8}|[A-Fa-f0-9]{6})$') @@ -40,16 +39,16 @@ def decimal_with_num_of_digits(num_of_digits): class colors(BaseDefClass): - white = op_colors.WHITE - blue = op_colors.BLUE - dark_blue = op_colors.DARKBLUE - yellow = op_colors.YELLOW - dark_yellow = op_colors.DARKYELLOW - green = op_colors.GREEN - dark_green = op_colors.DARKGREEN - black = op_colors.BLACK - red = op_colors.RED - dark_red = op_colors.DARKRED + white = '00FFFFFF' + blue = '000000FF' + dark_blue = '00000080' + yellow = '00FFFF00' + dark_yellow = '00808000' + green = '0000FF00' + dark_green = '00008000' + black = '00000000' + red = '00FF0000' + dark_red = '00800000' purple = '800080' grey = 'D3D3D3' From 1e673604ecd1c5302cf01d0db4f2f0f1b7e2ada5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 12:11:23 +0300 Subject: [PATCH 3/4] depen update(deps): update pandas requirement from <1.1.0 to <1.2.0 (#79) Updates the requirements on [pandas](https://github.com/pandas-dev/pandas) to permit the latest version. - [Release notes](https://github.com/pandas-dev/pandas/releases) - [Changelog](https://github.com/pandas-dev/pandas/blob/master/RELEASE.md) - [Commits](https://github.com/pandas-dev/pandas/compare/0.3.0...v1.1.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3544db1..5303a21 100644 --- a/setup.py +++ b/setup.py @@ -83,5 +83,5 @@ def find_version(*file_paths): # your project is installed. For an analysis of "install_requires" vs pip's # requirements files see: # https://packaging.python.org/en/latest/requirements.html - install_requires=['openpyxl>=2.5,<3.0.5', 'colour>=0.1.5,<0.2', 'jsonschema', 'xlrd>=1.0.0,<1.3.0', 'pandas<1.1.0'] + install_requires=['openpyxl>=2.5,<3.0.5', 'colour>=0.1.5,<0.2', 'jsonschema', 'xlrd>=1.0.0,<1.3.0', 'pandas<1.2.0'] ) From 4d5099ab230aa164fddc028b943d9b41022b0e77 Mon Sep 17 00:00:00 2001 From: Adi Date: Sun, 9 Aug 2020 21:32:24 +0300 Subject: [PATCH 4/4] Updated changelog and bumped version to 3.0.3. Closes #73 --- CHANGELOG.md | 5 ++++- styleframe/version.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66ad00d..eb1e12a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -### 3.0.2 +#### 3.0.3 +No longer relying on openpyxl's colors definition. Related to github issue #73 + +#### 3.0.2 Hotfix release - setting maximum versions for dependencies. Related to github issue #73 #### 3.0.1 diff --git a/styleframe/version.py b/styleframe/version.py index f453a0a..57f6f53 100644 --- a/styleframe/version.py +++ b/styleframe/version.py @@ -17,7 +17,7 @@ def get_all_versions(): return _versions_ -_version_ = '3.0.2' +_version_ = '3.0.3' _python_version_ = get_python_version() _pandas_version_ = get_pandas_version() _openpyxl_version_ = get_openpyxl_version()