Merge branch 'devel'

Author: DeepSpace2

.travis.yml

@@ -7,17 +7,19 @@ python:
   - 3.6
   - 3.7
   - 3.8
+  - 3.9-dev
   - "nightly"
 cache: pip
-env:
-  - PANDAS=specific
-  - PANDAS=latest
+# env:
+#   - PANDAS=specific
+#   - PANDAS=latest
 jobs:
   allow_failures:
+    - python: 3.9-dev
     - python: "nightly"
 install:
   - pip install -r requirements.txt
-  - if [ $PANDAS = latest ]; then pip install pandas -U; fi
+#   - if [ $PANDAS = latest ]; then pip install pandas -U; fi
   - pip install codecov
 before_script:
 - cd styleframe/tests/

CHANGELOG.md

@@ -1,3 +1,6 @@
+### 3.0.2
+Hotfix release - setting maximum versions for dependencies. Related to github issue #73
+
 #### 3.0.1
 * **Removed Python 2.7 support**
 * **Added Python 3.8 support**

docs/commandline_interface.rst

@@ -15,7 +15,7 @@ Flag                                   Explanation
 ====================================   =========================================================================
 ``-v``                                 Displays the installed versions of styleframe and its dependencies
 ``--json_path`` or ``--json-path``     Path to the json file
-``--json``          json string
+``--json``                             The json string which defines the Excel file, see example below
 ``--output_path`` or ``output-path``   Path to the output xlsx file. If not provided defaults to ``output.xlsx``
 ``--test``                             Execute the tests
 ====================================   =========================================================================

setup.py

@@ -83,13 +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', 'colour>=0.1.5', 'jsonschema', 'xlrd>=1.0.0'],
-    extras_require={
-        ':python_version <= "3.4"': [
-            'pandas >= 0.16.2, <= 0.22.*'
-        ],
-        ':python_version > "3.4"': [
-            'pandas >= 0.23.2'
-        ]
-    }
+    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']
 )

styleframe/version.py

@@ -17,7 +17,7 @@ def get_all_versions():
     return _versions_
 
 
-_version_ = '3.0.1'
+_version_ = '3.0.2'
 _python_version_ = get_python_version()
 _pandas_version_ = get_pandas_version()
 _openpyxl_version_ = get_openpyxl_version()