From 02ffb545e4cc243b808bfa6402ae13053c670b9b Mon Sep 17 00:00:00 2001 From: Tom Stesco Date: Wed, 20 Jan 2021 13:16:55 -0500 Subject: [PATCH] adding pandas 1.2.1 with bug fixes --- .dockerignore | 2 +- .gitignore | 6 +++++- Dockerfile | 4 ++-- README.md | 12 ++++++------ requirements_fixed.txt => requirements.txt | 18 +++++++++--------- .../DataClients/DataDestination.py | 2 -- 6 files changed, 23 insertions(+), 21 deletions(-) rename requirements_fixed.txt => requirements.txt (94%) diff --git a/.dockerignore b/.dockerignore index 19c4ee3..58efa8c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,6 +3,6 @@ !src/ !scripts/ !setup.py -!requirements_fixed.txt +!requirements.txt !requirements_unfixed.txt !pytest.ini diff --git a/.gitignore b/.gitignore index 6394eed..95ee515 100644 --- a/.gitignore +++ b/.gitignore @@ -20,11 +20,15 @@ data/ weather/ idf/ fmu/ +notebooks/ +notes/ !test/idf/v8-9-0/AZ_Phoenix_gasfurnace_crawlspace_IECC_2018_cycles.idf !test/idf/v9-4-0/heatedbsmt_2story_2300sqft_gasfurnace_AC.idf !test/idf/v9-4-0/heatedbsmt_1story_2000sqft_gasfurnace_AC.idf !test/idf/v9-4-0/slab_1story_2000sqft_gasfurnace_AC.idf !test/fmu/fmu-models/deadband/deadband.fmu +!requirements.txt +!requirements_unfixed.txt __pycache__/ .pytest_cache/ .ipynb_checkpoints/ @@ -35,4 +39,4 @@ docs/source/generated/ .test.env docker-compose.yml build/ -notebooks/test_* +!notebooks/test_* diff --git a/Dockerfile b/Dockerfile index 99d8c03..089b193 100644 --- a/Dockerfile +++ b/Dockerfile @@ -122,8 +122,8 @@ RUN sudo chown -R "${USER_NAME}" "${PACKAGE_DIR}" \ && ${PYENV_ROOT}/versions/3.8.6/bin/python3.8 -m venv "${LIB_DIR}/${VENV_NAME}" \ && . "${LIB_DIR}/${VENV_NAME}/bin/activate" \ && pip install --no-cache-dir --upgrade setuptools pip \ - && pip install --no-cache-dir -r "requirements_fixed.txt" \ - # && pip install --no-cache-dir -r "requirements_unfixed.txt" \ + # && pip install --no-cache-dir -r "requirements.txt" \ + && pip install --no-cache-dir -r "requirements_unfixed.txt" \ && pip install --editable . \ && cd "${EXT_DIR}/PyFMI" \ && python "setup.py" install --fmil-home="${FMIL_HOME}" \ diff --git a/README.md b/README.md index d790c0f..03ef087 100644 --- a/README.md +++ b/README.md @@ -311,29 +311,29 @@ python -m pytest src/python ## Changing dependency versions -The dependencies are pinned to exact versions in the `requirements_fixed.txt` file. +The dependencies are pinned to exact versions in the `requirements.txt` file. To change this simply change line (approx) 124 in the `Dockerfile` from: ``` - && pip install --no-cache-dir -r "requirements_fixed.txt" \ + && pip install --no-cache-dir -r "requirements.txt" \ # && pip install --no-cache-dir -r "requirements_unfixed.txt" \ ``` to ``` - # && pip install --no-cache-dir -r "requirements_fixed.txt" \ + # && pip install --no-cache-dir -r "requirements.txt" \ && pip install --no-cache-dir -r "requirements_unfixed.txt" \ ``` This will install the latest satisfying versions of all dependencies. After testing that -the dependencies are working freeze them into a new `requirements_fixed.txt` file. +the dependencies are working freeze them into a new `requirements.txt` file. ``` -pip freeze > requirements_fixed.txt +pip freeze > requirements.txt ``` Several dependencies are installed from source so these must be removed from the -`requirements_fixed.txt` file. These are: +`requirements.txt` file. These are: ``` PyFMI diff --git a/requirements_fixed.txt b/requirements.txt similarity index 94% rename from requirements_fixed.txt rename to requirements.txt index a8c249a..f5750c9 100644 --- a/requirements_fixed.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ click==7.1.2 coverage==5.3.1 cycler==0.10.0 Cython==0.29.21 -dask==2020.12.0 +dask==2021.1.0 decorator==4.4.2 defusedxml==0.6.0 docutils==0.16 @@ -30,14 +30,14 @@ flake8==3.8.4 fsspec==0.8.5 future==0.18.2 gcsfs==0.7.1 -google-api-core==1.24.1 +google-api-core==1.25.0 google-auth==1.24.0 google-auth-oauthlib==0.4.2 google-cloud-bigquery==2.3.1 google-cloud-bigquery-storage==2.1.0 google-cloud-core==1.5.0 google-cloud-storage==1.35.0 -google-crc32c==1.1.0 +google-crc32c==1.1.1 google-resumable-media==1.2.0 googleapis-common-protos==1.52.0 grpcio==1.34.1 @@ -72,7 +72,7 @@ munch==2.5.0 mypy-extensions==0.4.3 nbclient==0.5.1 nbconvert==6.0.7 -nbformat==5.1.0 +nbformat==5.1.2 nest-asyncio==1.4.3 notebook==6.2.0 numba==0.52.0 @@ -81,7 +81,7 @@ numexpr==2.7.2 numpy==1.19.5 oauthlib==3.1.0 packaging==20.8 -pandas==1.2.0 +pandas==1.2.1 pandas-gbq==0.14.1 pandocfilters==1.4.3 parso==0.8.1 @@ -93,7 +93,7 @@ Pillow==8.1.0 plotly==4.14.3 pluggy==0.13.1 prometheus-client==0.9.0 -prompt-toolkit==3.0.10 +prompt-toolkit==3.0.11 proto-plus==1.13.0 protobuf==3.14.0 psutil==5.8.0 @@ -114,14 +114,14 @@ pytest==6.2.1 pytest-ordering==0.6 python-dateutil==2.8.1 pytz==2020.5 -PyYAML==5.3.1 -pyzmq==21.0.0 +PyYAML==5.4 +pyzmq==21.0.1 regex==2020.11.13 requests==2.25.1 requests-oauthlib==1.3.0 retrying==1.3.3 rsa==4.7 -scikit-learn==0.24.0 +scikit-learn==0.24.1 scipy==1.6.0 Send2Trash==1.5.0 Shapely==1.7.1 diff --git a/src/python/BuildingControlsSimulator/DataClients/DataDestination.py b/src/python/BuildingControlsSimulator/DataClients/DataDestination.py index 46a4b83..c3eb209 100644 --- a/src/python/BuildingControlsSimulator/DataClients/DataDestination.py +++ b/src/python/BuildingControlsSimulator/DataClients/DataDestination.py @@ -116,8 +116,6 @@ def write_data_by_extension( index=False, ) elif file_extension == "csv.zip": - raise NotImplementedError("Pandas 1.2.0 has issue with writting zip files.") - # see _df.to_csv( filepath_or_buffer, compression="zip",