Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Dockerfile and Pipfile.lock and fixed tests #458

Merged
merged 7 commits into from
Mar 11, 2023

Conversation

ssuffian
Copy link
Contributor

@ssuffian ssuffian commented Feb 3, 2023

The updates to the Dockerfile and Pipfile.lock led to the need to change a few of the pytests, although it doesn't appear to have changed any of the underlying code. The primary change that affected tests was that pandas dataframes .sum().sum() no longer sum Categorical type values.

Also, the newer jupyterlab version requires rust, so a rust installation is now included in the Dockerfile.

I also found that the sample data CLI wasn't working, which seems unrelated to the updated dependencies and instead due to a column name issue. The sample data was loading in with a usage_per_day column that needed to instead be meter_value. I think this is the issue that was referenced here (and is now fixed in this PR): #377

Signed-off-by: Stephen Suffian [email protected]

Your checklist for this pull request

Please review the guidelines for contributing to this repository.

  • Make sure you are requesting to pull a feature/bugfix branch (right side). Don't request your master!
  • Make sure tests pass and coverage has not fallen docker-compose run --rm test.
  • Update the CHANGELOG.md to describe your changes in a bulleted list under the "Development" section at the top of the changelog. If this section does not exist, create it.
  • Make sure code style follows PEP 008 using docker-compose run --rm blacken.
  • Make sure that new functions and classes have inline docstrings and are
    included in docs/api.rst for the sphinx build. Please use numpy-style docstrings.
    Sphinx docs can be built with the following command: docker-compose run --rm --entrypoint="make -C docs html" shell. Please note and fix any warnings.
  • Make sure that all git commits are have the "Signed-off-by" message for
    the Developer Certificate of Origin. When you're making a commit, just add
    the -s/--signoff flag (e.g., git commit -s).

Description

Please describe your pull request.

@ssuffian ssuffian force-pushed the update-docker-and-dependencies branch from d62ba6b to 6e28565 Compare February 4, 2023 05:19
@ssuffian ssuffian requested review from philngo-recurve and jglasskatz and removed request for jglasskatz February 4, 2023 05:26
ssuffian added 7 commits March 7, 2023 15:39
changes in updated dependencies, and fixed a bug with the sample data.

- pandas dataframes .sum().sum() no longer sum Categorical type values.
- sample data was loading in with a `usage_per_day` column that needs to
  be `meter_value`.

Signed-off-by: Stephen Suffian <[email protected]>
Signed-off-by: Stephen Suffian <[email protected]>
Signed-off-by: Stephen Suffian <[email protected]>
@ssuffian ssuffian force-pushed the update-docker-and-dependencies branch from f6c6a35 to d90999c Compare March 7, 2023 20:39
Copy link
Contributor

@philngo-recurve philngo-recurve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! Thank you.

@philngo-recurve philngo-recurve merged commit 6d31d34 into master Mar 11, 2023
This was referenced Jun 7, 2023
@travis-recurve travis-recurve deleted the update-docker-and-dependencies branch March 11, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants