From 8cf8523b78e6df4a111a58aaa34a63bf7cadf75b Mon Sep 17 00:00:00 2001 From: Daidson Alves Date: Thu, 2 Jun 2022 12:21:34 -0300 Subject: [PATCH] fixing ESUS connection and elasticsearch requirements --- README.md | 2 +- pyproject.disabled | 2 +- pysus/online_data/ESUS.py | 2 +- requirements.txt | 2 +- setup.cfg | 2 +- setup.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index fb38afbc..52739dad 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ If you use PySUS for a publication, please use the bibtex below to cite it: month = may, year = 2021, publisher = {Zenodo}, - version = {0.5.9}, + version = {0.5.17}, doi = {10.5281/zenodo.4883502}, url = {https://doi.org/10.5281/zenodo.4883502} } diff --git a/pyproject.disabled b/pyproject.disabled index 9bf7224c..f8142a12 100644 --- a/pyproject.disabled +++ b/pyproject.disabled @@ -24,7 +24,7 @@ wget = "==3.2" colorcet = "==3.0.0" datashader = "==0.13.0" #rasterstats = "==0.16.0" -elasticsearch = "==8.1.2" +elasticsearch = "==7.16.2" tqdm = "==4.64.0" gdal = "3.4.1" geopandas = "==0.7.0" diff --git a/pysus/online_data/ESUS.py b/pysus/online_data/ESUS.py index 6be645dd..9b7d2850 100644 --- a/pysus/online_data/ESUS.py +++ b/pysus/online_data/ESUS.py @@ -22,7 +22,7 @@ def download(uf, cache=True, checkmemory=True): pwd = "Za4qNXdyQNSa9YaA" today = date.today() dt = today.strftime("_%d_%m_%Y") - base = f"desc-notificacoes-esusve-{uf}" # desc-notificacoes-esusve- + base = f"desc-esus-notifica-estado-{uf}" # desc-notificacoes-esusve- url = f"https://{user}:{pwd}@elasticsearch-saps.saude.gov.br" out = f"ESUS_{uf}_{dt}.parquet" diff --git a/requirements.txt b/requirements.txt index 9c048260..9df7e533 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ colorcet==3.0.0 datashader==0.13.0 xarray==2022.3.0 georasters -elasticsearch==8.1.2 +elasticsearch==7.16.2 pyarrow==7.0.0 tqdm==4.64.0 diff --git a/setup.cfg b/setup.cfg index c2133ed4..d31be5e0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [build_sphinx] project = 'PySUS' version = 0.5 -release = 0.5.16 +release = 0.5.17 source-dir = './docs/source' [flake8] diff --git a/setup.py b/setup.py index 13b0f886..5d033f95 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ setup( name="PySUS", - version="0.5.16", + version="0.5.17", packages=find_packages(), package_data={"": ["*.c", "*.h", "*.o", "*.so", "*.md", "*.txt"]}, include_package_data=True,