Closed ctmes closed 1 month ago
IDK how to fix string.py, # type: ignore won't ignore it all
But there are some issues in main.py, path.py, string.py that I don't know how to fix
IDK how to fix string.py, # type: ignore won't ignore it all
Did you do git merge main
? #49 should have fixed the issues but your PR is reverting changes from that PR
IDK how to fix string.py, # type: ignore won't ignore it all
Did you do
git merge main
? #49 should have fixed the issues but your PR is reverting changes from that PR
Yeah, I've been trying to pull in a variety of ways but it doesn't seem to be doing anything
git merge origin/main
and git pull
and git fetch
say the same thing too
IDK how to fix string.py, # type: ignore won't ignore it all
Did you do
git merge main
? #49 should have fixed the issues but your PR is reverting changes from that PRYeah, I've been trying to pull in a variety of ways but it doesn't seem to be doing anything
git merge origin/main and git pull say the same thing too
Did you checkout main
and do git pull
to fetch updates from main
before merging? Or maybe you got a merge conflict for strings.py
and path.py
and overwritten the changes from main
with your own branch?
IDK how to fix string.py, # type: ignore won't ignore it all
Did you do
git merge main
? #49 should have fixed the issues but your PR is reverting changes from that PRYeah, I've been trying to pull in a variety of ways but it doesn't seem to be doing anything git merge origin/main and git pull say the same thing too
Did you checkout
main
and dogit pull
to fetch updates frommain
before merging? Or maybe you got a merge conflict forstrings.py
andpath.py
and overwritten the changes frommain
with your own branch?
I did checkout main, git pull; this did nothing since I git fetch whenever I open vscode anyway. I don't see any merge conflicts.
Strangely, I did revert a commit locally, then git pulled and it pulled it properly.
IDK how to fix string.py, # type: ignore won't ignore it all
Did you do
git merge main
? #49 should have fixed the issues but your PR is reverting changes from that PRYeah, I've been trying to pull in a variety of ways but it doesn't seem to be doing anything git merge origin/main and git pull say the same thing too
Did you checkout
main
and dogit pull
to fetch updates frommain
before merging? Or maybe you got a merge conflict forstrings.py
andpath.py
and overwritten the changes frommain
with your own branch?I did checkout main, git pull; this did nothing since I git fetch whenever I open vscode anyway. I don't see any merge conflicts.
Strangely, I did revert a commit locally, then git pulled and it pulled it properly.
There is this though for some reason, even tho I've fetched and pulled and pushes multiple times
There is this though for some reason, even tho I've fetched and pulled and pushes multiple times
Yeah that's weird, I can't merge from main either so you likely got a merge conflict and did something with it? Try checking out afb612d4dff363d72f1a1365d051557bd78bd67d
(i.e. revert one commit) and do git merge, that will give you a merge conflict whcih you can fix
OK, I have no idea what is going on, I manually copied and edited the fixed versions logging.py
and string.py
files, which worked. Then I was just debugging the newread_config
function, then I saw that now the file join_on_sa1.py
has errors now which didn't exist before
OK, I have no idea what is going on, I manually copied and edited the fixed versions
logging.py
andstring.py
files, which worked. Then I was just debugging the newread_config
function, then I saw that now the filejoin_on_sa1.py
has errors now which didn't exist before
OK, I have no idea what is going on, I manually copied and edited the fixed versions
logging.py
andstring.py
files, which worked. Then I was just debugging the newread_config
function, then I saw that now the filejoin_on_sa1.py
has errors now which didn't exist beforeEDIT: OK I'm goated It's fixed
ok to be more precise, I manually copied the working main
, path
, string.py
files so they match (integrating the read_config
function as well), and then applied type annotation to the join_on_sa1.py
file. There should be no conflicts, but if there are I'll review and fix them
@ctmes
Yup, just seen all the changes. I assume the EPSG in the testing is just an arbitrary value since all other values are arbitrary?
@ctmes
Yup, just seen all the changes. I assume the EPSG in the testing is just an arbitrary value since all other values are arbitrary?
yup it's just there to fill the parameter
Title: "Closes #23, #21"
Summary of Changes
Added polars conversion of joining GNAF example data with shapefiles, logging included with configurations.yml file for user choice selection.
Optional Further Details
join_on_sa1.py:
configurations.yml:
Screenshots
If applicable, add screenshots to help visualize the changes.
Checklist:
Additional context
Add any other context or relevant information about the pull request here.