Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion atlasapi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# __init__.py

# Version of the realpython-reader package
__version__ = "2.0.4"
__version__ = "2.0.5"
11 changes: 6 additions & 5 deletions atlasapi/network.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
def merge(dict1, dict2):
return dict2.update(dict1)


class Network:
"""Network constructor

Expand Down Expand Up @@ -162,6 +163,7 @@ def get_big(self, uri, params: dict = None):
This is a temporary fix until we re-factor pagination.

Args:
params: dict of parameters that should be sent on the path
uri (str): URI

Returns:
Expand All @@ -171,16 +173,15 @@ def get_big(self, uri, params: dict = None):
Exception: Network issue
"""
r = None
print(f"Revieved the following parameters {params}")
if params:
logger.warning(f"Revieved the following parameters {params}")
merge({'itemsPerPage': Settings.itemsPerPage},params)
logger.warning(f"The parameters are now {params}")
logger.debug(f"Recieved the following parameters to the get_big method : {params}")
merge({'itemsPerPage': Settings.itemsPerPage}, params)
logger.debug(f"The parameters are now {params}")
else:
params = {'itemsPerPage': Settings.itemsPerPage}

try:
logger.warning(f"The parameters object is {params}")
logger.debug(f"The parameters object is {params}")
r = requests.get(uri,
allow_redirects=True,
params=params,
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

setup(
name='atlasapi',
version='2.0.4',
version='2.0.5',
python_requires='>=3.7',
packages=find_packages(exclude=("tests",)),
install_requires=['requests', 'python-dateutil', 'isodate', 'future', 'pytz','coolname', 'humanfriendly', 'nose'],
install_requires=['requests', 'python-dateutil', 'isodate', 'future', 'pytz', 'coolname', 'humanfriendly', 'nose'],
setup_requires=['wheel'],
# Metadata
author="Matthew G. Monteleone",
Expand Down Expand Up @@ -40,7 +40,6 @@
],
entry_points={
'console_scripts': [
#final script name:local package name:local function name
'atlascli=atlascli.cli:main',
]
},
Expand Down