Merge pull request #109 from sentinel-hub/feat/python3.5-drop

Feat/python3.5 drop

Author: iovsn

.travis.yml

@@ -6,7 +6,6 @@ notifications:
   email: false
 
 python:
-- "3.5"
 - "3.6"
 - "3.7"
 - "3.8"

README.md

@@ -19,7 +19,7 @@ stored in ESA .SAFE format (all types of .SAFE format are supported).
 
 # Installation
 
-The package requires a Python version >= 3.5 and installed C/C++ compiler. The package is available on
+The package requires a Python version >= 3.6 and installed C/C++ compiler. The package is available on
 the PyPI package manager and can be installed with
 
 ```

sentinelhub/_version.py

@@ -2,4 +2,4 @@
 Version of sentinelhub package
 """
 
-__version__ = '3.0.0.b1'
+__version__ = '3.0.0'

sentinelhub/config.py

@@ -4,7 +4,6 @@
 
 import os
 import json
-from collections import OrderedDict
 
 
 class SHConfig:
@@ -42,26 +41,26 @@ class SHConfig:
     class _SHConfig:
         """ Internal class holding configuration parameters
         """
-        CONFIG_PARAMS = OrderedDict([
-            ('instance_id', ''),
-            ('sh_client_id', ''),
-            ('sh_client_secret', ''),
-            ('sh_base_url', 'https://services.sentinel-hub.com'),
-            ('geopedia_wms_url', 'https://service.geopedia.world'),
-            ('geopedia_rest_url', 'https://www.geopedia.world/rest'),
-            ('aws_access_key_id', ''),
-            ('aws_secret_access_key', ''),
-            ('aws_metadata_url', 'https://roda.sentinel-hub.com'),
-            ('aws_s3_l1c_bucket', 'sentinel-s2-l1c'),
-            ('aws_s3_l2a_bucket', 'sentinel-s2-l2a'),
-            ('opensearch_url', 'http://opensearch.sentinel-hub.com/resto/api/collections/Sentinel2'),
-            ('max_wfs_records_per_query', 100),
-            ('max_opensearch_records_per_query', 500),
-            ('max_download_attempts', 4),
-            ('download_sleep_time', 5),
-            ('download_timeout_seconds', 120),
-            ('number_of_download_processes', 1)
-        ])
+        CONFIG_PARAMS = {
+            'instance_id': '',
+            'sh_client_id': '',
+            'sh_client_secret': '',
+            'sh_base_url': 'https://services.sentinel-hub.com',
+            'geopedia_wms_url': 'https://service.geopedia.world',
+            'geopedia_rest_url': 'https://www.geopedia.world/rest',
+            'aws_access_key_id': '',
+            'aws_secret_access_key': '',
+            'aws_metadata_url': 'https://roda.sentinel-hub.com',
+            'aws_s3_l1c_bucket': 'sentinel-s2-l1c',
+            'aws_s3_l2a_bucket': 'sentinel-s2-l2a',
+            'opensearch_url': 'http://opensearch.sentinel-hub.com/resto/api/collections/Sentinel2',
+            'max_wfs_records_per_query': 100,
+            'max_opensearch_records_per_query': 500,
+            'max_download_attempts': 4,
+            'download_sleep_time': 5,
+            'download_timeout_seconds': 120,
+            'number_of_download_processes': 1
+        }
 
         def __init__(self):
             self.instance_id = ''
@@ -118,12 +117,12 @@ def load_configuration(self):
                     setattr(self, prop, config[prop])
 
         def get_config(self):
-            """ Returns ordered dictionary with configuration parameters
+            """ Returns a dictionary with configuration parameters
 
-            :return: Ordered dictionary
-            :rtype: collections.OrderedDict
+            :return: A dictionary
+            :rtype: dict
             """
-            config = OrderedDict((prop, getattr(self, prop)) for prop in self.CONFIG_PARAMS)
+            config = {prop: getattr(self, prop) for prop in self.CONFIG_PARAMS}
             if config['instance_id'] is None:
                 config['instance_id'] = ''
             return config
@@ -231,9 +230,9 @@ def get_config_dict(self):
         """ Get a dictionary representation of `SHConfig` class
 
         :return: A dictionary with configuration parameters
-        :rtype: OrderedDict
+        :rtype: dict
         """
-        return OrderedDict((prop, getattr(self, prop)) for prop in self._instance.CONFIG_PARAMS)
+        return {prop: getattr(self, prop) for prop in self._instance.CONFIG_PARAMS}
 
     def get_config_location(self):
         """ Returns location of configuration file on disk

setup.py

@@ -57,7 +57,7 @@ def update_package_config():
 
 setup(
     name='sentinelhub',
-    python_requires='>=3.5',
+    python_requires='>=3.6',
     version=get_version(),
     description='Sentinel Hub Utilities',
     long_description=get_long_description(),
@@ -90,7 +90,6 @@ def update_package_config():
         'Operating System :: Unix',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',