Skip to content

Commit

Permalink
Merge pull request #65 from MAAP-Project/develop
Browse files Browse the repository at this point in the history
Merge into master
  • Loading branch information
bsatoriu authored Oct 28, 2023
2 parents 5d93f64 + 9ef1d02 commit ceb7426
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
17 changes: 3 additions & 14 deletions maap/config_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ def __init__(self, maap_host=None, config_file_path=''):
self.__member = self._get_api_endpoint("member")
self.__tiler_endpoint = self.__config.get("service", "tiler_endpoint")

self.__query_endpoint = self._get_api_endpoint("query_endpoint")



self.__aws_access_key = os.environ.get("AWS_ACCESS_KEY_ID") or self.__config.get("aws", "aws_access_key_id")
self.__aws_access_secret = os.environ.get("AWS_SECRET_ACCESS_KEY") or self.__config.get("aws",
"aws_secret_access_key")
Expand Down Expand Up @@ -244,19 +246,6 @@ def maap_host(self, val):
self.__maap_host = val
return

@property
def query_endpoint(self):
return self.__query_endpoint

@query_endpoint.setter
def query_endpoint(self, val):
"""
:param val:
:return: None
"""
self.__query_endpoint = val
return

@property
def aws_access_key(self):
return self.__aws_access_key
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
_namespaces = []
_test_suite = ''
_url = 'https://github.com/MAAP-Project/maap-py'
_version = '3.0.0'
_version = '3.1.3'
_zip_safe = False

# Setup Metadata
Expand Down

0 comments on commit ceb7426

Please sign in to comment.