Skip to content

Issue 60 61#68

Merged
jomey merged 27 commits intoapi_upload_updatefrom
issue_60_61
Jul 28, 2025
Merged

Issue 60 61#68
jomey merged 27 commits intoapi_upload_updatefrom
issue_60_61

Conversation

@micah-prime
Copy link
Copy Markdown
Contributor

Comment thread snowex_db/point_primary_variable_overrides.yaml Outdated
Comment thread snowex_db/point_primary_variable_overrides.yaml Outdated
Comment thread snowex_db/point_primary_variable_overrides.yaml
Comment thread snowex_db/point_data.py Outdated
micah-prime and others added 8 commits July 15, 2025 10:41
* starting to make changes for insitupy >0.4

* Getting closer to having this running

* I think my variable overrides logic isn't getting applied fully

* Files parse, but I'm missing some columns

* Point tests passing

* I think this is just held up on merging the comments change now

* insitupy version

* Address PR comments

* Doc string
@micah-prime
Copy link
Copy Markdown
Contributor Author

FYI I added the fixes for the layer data tests with the new insitupy to this PR

@jomey
Copy link
Copy Markdown
Member

jomey commented Jul 24, 2025

@micah-prime - Can you look into these conflicts and remaining open conversations?
Would like to merge this afterwards

jomey added 5 commits July 24, 2025 09:45
Also return a GeoDataframe to match method return signature.
Call to super did not change anything.
Conflicts:
* snowex_db/point_data.py
* snowex_db/point_primary_variable_overrides.yaml
* snowex_db/upload/points.py
@jomey
Copy link
Copy Markdown
Member

jomey commented Jul 24, 2025

@micah-prime - Can you look into these conflicts and remaining open conversations? Would like to merge this afterwards

I have some time now and looking into pushing this PR over the finish line 🏁

@micah-prime
Copy link
Copy Markdown
Contributor Author

@micah-prime - Can you look into these conflicts and remaining open conversations? Would like to merge this afterwards

I have some time now and looking into pushing this PR over the finish line 🏁

Thanks @jomey, I won't have time to dive too much until next week.

jomey added 5 commits July 25, 2025 17:50
Instrument mapping was already done at the dataframe setup and allows to
skip this step at the record creation point. Other changes combine
multiple lines into one.
Row dictionary does not always have these present on the dataframe.
Only use the "name" attribute if it is explicitly passed as a kwarg.
Otherwise use the PitID parsed from the row header.
@jomey
Copy link
Copy Markdown
Member

jomey commented Jul 26, 2025

Tests to be green locally for points and layers need this PR to be merged
M3Works/insitupy#30

Note that I started a separate branch to fix raster tests.

Generally, the tests don't pass for p 3.12 with an invalid import statement. Still need to have a look at that. We could also merge this as is and tackle a green CI in another PR.

I vote to not use the 'squash merge' on this PR so we can better track commits later.

@jomey jomey requested review from Ibrahim-Ola and jomey and removed request for jomey July 26, 2025 00:11
@micah-prime micah-prime enabled auto-merge (rebase) July 28, 2025 16:36
@micah-prime
Copy link
Copy Markdown
Contributor Author

@jomey this is on auto-merge now. I can't approve it since I opened it, but once you approve it will be merged!

@jomey
Copy link
Copy Markdown
Member

jomey commented Jul 28, 2025

@jomey this is on auto-merge now. I can't approve it since I opened it, but once you approve it will be merged!

Have you had a chance to run the tests locally?
I have Python 3.12 and they pass. Curious why the GH actions have trouble

@micah-prime micah-prime mentioned this pull request Jul 28, 2025
@aaarendt
Copy link
Copy Markdown
Contributor

@jomey I can confirm the tests all run locally, except for 10 errors all in the rasters folder.

@micah-prime
Copy link
Copy Markdown
Contributor Author

@aaarendt that's awesome! If you approve I should be able to get this merged in

auto-merge was automatically disabled July 28, 2025 22:32

Rebase failed

@jomey jomey merged commit eaf08d0 into api_upload_update Jul 28, 2025
0 of 12 checks passed
@jomey jomey deleted the issue_60_61 branch July 28, 2025 22:32
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