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

adding epfl to institutuions #542

Merged

Conversation

till-schertenleib
Copy link
Contributor

No description provided.

@till-schertenleib
Copy link
Contributor Author

looks like the merging is blocked. I guess because this is the public branch? let me know if I shouldn't touch the public branch.

Copy link
Contributor

@sbillinge sbillinge left a comment

Choose a reason for hiding this comment

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

This looks good.

The best way to add these though is to use helper_gui.

in a terminal, go to your rg-db-public/local folder, activate your conda env that does this, then type helper_gui. This would be the u_institution helper.

city: Sion
country: Switzerland
zip: '1951'
departements:
Copy link
Contributor

Choose a reason for hiding this comment

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

typo here.

Copy link
Contributor

@sbillinge sbillinge left a comment

Choose a reason for hiding this comment

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

Thanks. Let's try and redo it using the helper_gui just to get the workflow down.

@till-schertenleib
Copy link
Contributor Author

Ok I tried with the gui. Let me know if it didn't work.

@till-schertenleib
Copy link
Contributor Author

It looks like I need to specify an index in the helper GUI. 'index of the item in the enumerated list to update'. How do I find or define this index?

@sbillinge
Copy link
Contributor

It looks like I need to specify an index in the helper GUI. 'index of the item in the enumerated list to update'. How do I find or define this index?

yes, it is not completely intuitive unfortunately. For a new entry you put 1 there

@till-schertenleib
Copy link
Contributor Author

Ok then I think it should be updated now.

@sbillinge
Copy link
Contributor

Ok then I think it should be updated now.

That's great. Did you commit and push?

@till-schertenleib
Copy link
Contributor Author

I'm a bit confused. Is it correct that I should run the helper_gui always from here: ~/dbs/rg-db-group/local ? like described here:https://gitlab.thebillingegroup.com/resources/group-wiki/-/wikis/Regolith%20Helpers%20Infrastructure

If I run the GUI there, it creates a file 'new_institution.yml'. Should I add this to git and then push and commit it?

I'm confused because I thought the point of using git is to alsway checkout into a new branch to make changes and the push them. But with the GUI I'm not in a separate branch...

@sbillinge
Copy link
Contributor

sbillinge commented Sep 13, 2023 via email

@till-schertenleib
Copy link
Contributor Author

Okay I see. I didn't see that I could specify the database in the GUI. I tried again.... I think I did it correctly now and it worked

My workflow:

  1. create a new branch git checkout -b add_epfl_to_institute
  2. run the GUI while being in the public database - buy running the GUI, all it does is that it modifies the file, e.g. institutions.yml' right?
  3. I push and commit
  4. I check-out to the main branch

Is that correct? I guess I could have done the same from the group directory, but I would have had to specify the correct path to the target db in the GUI

@sbillinge
Copy link
Contributor

sbillinge commented Sep 14, 2023 via email

@till-schertenleib
Copy link
Contributor Author

Okay I see. I think my last try yesterday with the GUI worked. but I'm not sure if the commit and pull request went through..

@sbillinge
Copy link
Contributor

sbillinge commented Sep 14, 2023 via email

@till-schertenleib
Copy link
Contributor Author

To the public/db - if I did it correctly...

@till-schertenleib
Copy link
Contributor Author

Just for me to make sure I know how it works, I re-did everything using the helper_gui. I also committed and pushed to the public db.

Copy link
Contributor

@sbillinge sbillinge left a comment

Choose a reason for hiding this comment

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

yes, great work, you did it right...

There are some small things to fix, please see inline comments.

isic:
name: Institute of Chemical Sciences and Engineering
aka:
- Institut
Copy link
Contributor

Choose a reason for hiding this comment

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

this may need a quick fix. the entries in the gui are space separated so with the gui you would have had to do "Institute des sciences....." with the quotes for it to work. To fix it, just edit the file directly.

sb:
name: school of basic science
aka:
- faculté
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah I missed that. I corrected the file and committed and pushed it.

@sbillinge
Copy link
Contributor

This PR is failing CI. To see why click on "Details" next to the CI and you should be able to see the error message. because it is a database it is picky about the exact format, which is easy to get wrong when we edit it the db. if it seems confusing, read about the yaml format to understand the relationship between syntax and the meaning, it is a gift that will keep on giving.

@sbillinge
Copy link
Contributor

@till-schertenleib gentle ping on this. Let me know if you need help

@sbillinge
Copy link
Contributor

gentle ping on this. Can we merge or close it?

@till-schertenleib
Copy link
Contributor Author

Since I couldn't find the syntax error, I freshly added epfl to institute.yml using the helper GUI. I just committed the changes.

@sbillinge sbillinge merged commit 96b707f into Billingegroup:main Oct 9, 2023
1 check passed
@sbillinge
Copy link
Contributor

haha, that took care of it!

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.

2 participants