Merge branch 'devel'

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

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.2.0']
 )

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'
 

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()