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

Add parse growth file task #14

Merged
merged 23 commits into from
Nov 1, 2023
Merged

Add parse growth file task #14

merged 23 commits into from
Nov 1, 2023

Conversation

Isabelle-C
Copy link
Collaborator

Resolves #13

@Isabelle-C Isabelle-C self-assigned this Jan 3, 2023
@Isabelle-C Isabelle-C added the priority: medium Non-urgent but important task label Jan 3, 2023
@codecov-commenter
Copy link

codecov-commenter commented Jan 7, 2023

Codecov Report

Merging #14 (5968462) into main (7aa5dfe) will increase coverage by 24.14%.
The diff coverage is 81.35%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@            Coverage Diff             @@
##            main      #14       +/-   ##
==========================================
+ Coverage   0.00%   24.14%   +24.14%     
==========================================
  Files         13       15        +2     
  Lines        293      352       +59     
==========================================
+ Hits           0       85       +85     
+ Misses       293      267       -26     
Impacted Files Coverage Δ
src/arcade_collection/output/parse_params_file.py 38.88% <38.88%> (ø)
src/arcade_collection/output/__init__.py 100.00% <100.00%> (+100.00%) ⬆️
src/arcade_collection/output/parse_growth_file.py 100.00% <100.00%> (ø)

... and 5 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@Isabelle-C
Copy link
Collaborator Author

Hi @jessicasyu, I completed the parse_growth_file and the corresponding test. Please only review these two.

A few things I would like to mention:

  1. I edited the __init__ in src/output/ so I added some code for parse_param_file.py to prevent errors. I think it's better if I complete parse_param_file after you review this round since it is very similar to parse_growth_file. The lint is not passing because parse_param_file is incomplete.
  2. There are two functions: convert_state_to_string and parse_growth_timepoint that I use in parse_growth_file. I am not sure if the tests of those are needed.
  3. I modified the tox.ini to accommodate my local testing environment. I will revert to the original python version later.

Thank you so much!

@Isabelle-C Isabelle-C requested a review from jessicasyu January 10, 2023 00:41
Copy link
Member

@jessicasyu jessicasyu left a comment

Choose a reason for hiding this comment

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

Good start! The structure of the repo has changed so you'll need to fix merge conflicts. In particular, revisit how the __init__.py is handled.

src/arcade_collection/output/parse_growth_file.py Outdated Show resolved Hide resolved
src/arcade_collection/output/parse_growth_file.py Outdated Show resolved Hide resolved
src/arcade_collection/output/parse_growth_file.py Outdated Show resolved Hide resolved
src/arcade_collection/output/parse_growth_file.py Outdated Show resolved Hide resolved
src/arcade_collection/output/parse_growth_file.py Outdated Show resolved Hide resolved
src/arcade_collection/output/parse_growth_file.py Outdated Show resolved Hide resolved
src/arcade_collection/output/parse_growth_file.py Outdated Show resolved Hide resolved
tests/arcade_collection/output/test_parse_growth_file.py Outdated Show resolved Hide resolved
tests/arcade_collection/output/test_parse_growth_file.py Outdated Show resolved Hide resolved
tests/arcade_collection/output/test_parse_growth_file.py Outdated Show resolved Hide resolved
@jessicasyu jessicasyu changed the title Add Arcade v2 parsing Add ARCADE v2 parsing tasks May 23, 2023
Copy link
Member

@jessicasyu jessicasyu left a comment

Choose a reason for hiding this comment

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

@Isabelle-C This version is pretty far behind main at this point, I would merge main into this branch and fix any merge conflicts/linting errors (I think there are a couple mypy issues). It might make sense to have this PR just be for the parse growth file task, and put the parse params file task into a different PR.

src/arcade_collection/output/__init__.py Outdated Show resolved Hide resolved
src/arcade_collection/output/parse_growth_file.py Outdated Show resolved Hide resolved
src/arcade_collection/output/parse_growth_file.py Outdated Show resolved Hide resolved
src/arcade_collection/output/parse_growth_file.py Outdated Show resolved Hide resolved
src/arcade_collection/output/parse_growth_file.py Outdated Show resolved Hide resolved
@Isabelle-C
Copy link
Collaborator Author

@jessicasyu Sounds great! I merged main, fixed and mypy error, and deleted the parse param. Once this PR is finished, I will open a new one for the parse param.

I was wondering in the src/arcade_collection/output/__init__.py, there is a block with things like parse_cells_file = task(parse_cells_file). I tried to do the same for parse growth, but the pytest does not work. There is a TypeError: module, class, method, function, traceback, frame, or code object was expected, got Task for pytest. I did attempt to resolve this, but couldn't. Thank you!

@Isabelle-C Isabelle-C requested a review from jessicasyu October 25, 2023 18:09
@jessicasyu jessicasyu changed the title Add ARCADE v2 parsing tasks Add parse growth file task Nov 1, 2023
@jessicasyu jessicasyu added type: feature Improvement or additions to the code base and removed priority: medium Non-urgent but important task labels Nov 1, 2023
@jessicasyu jessicasyu merged commit a56b938 into main Nov 1, 2023
4 checks passed
@jessicasyu jessicasyu deleted the isabellec/arcadev2output branch November 1, 2023 23:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: feature Improvement or additions to the code base
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add ARCADE v2 parsing tasks
3 participants