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

Resync crosswalks with the main repository. #28

Closed
wants to merge 1 commit into from

Conversation

progval
Copy link
Member

@progval progval commented Mar 20, 2020

Applies the latest state of the master branch of the main repository (plus these PRs: codemeta/codemeta#237 codemeta/codemeta#238 codemeta/codemeta#239 )

@mbjones
Copy link
Contributor

mbjones commented Mar 26, 2020

@amoeba I'm unsure, but I think this PR is reverting some of the work you did on consistently using schema:author over other contributor and creator fields. I suspect this is because we haven't been following a commit practice for releases, and so master no longer reflects the current release. @cboettig can you and @amoeba review to see if its ok to merge this?

@amoeba
Copy link

amoeba commented Mar 30, 2020

Hey @mbjones, from a quick scan, I think this is mostly fine. But I notice that, when I re-build the site today I get a larger (17 file) change set than in this PR so I'd be inclined to close this unmerged and update once we've resolved #32.

@progval
Copy link
Member Author

progval commented Mar 30, 2020

@amoeba Which files are changed?

@amoeba
Copy link

amoeba commented Mar 30, 2020

Hey @progval, here's what I get: hugo...amoeba:hugo. I think the files you changed are changed in the same way as mine. Now that I look again, it looks like the changes I have that you don't are some sort of RMarkdown fluff that Blogdown added automatically. Sorry for not noticing that at my first look. Aside from the added <script> tags, are our changes effectively the same?

@progval
Copy link
Member Author

progval commented Mar 30, 2020

In its currents state, it undoes some fixes made previously on the generated files. You should either apply codemeta/codemeta#237 + codemeta/codemeta#238 + codemeta/codemeta#239 to a local crosswalk.csv file and use it as input, or wait for them to be merged in codemeta/codemeta.

@progval
Copy link
Member Author

progval commented Mar 30, 2020

And your branch is missing the changes in terms.Rmd

@amoeba
Copy link

amoeba commented Mar 31, 2020

Okay, thanks for taking a look @progval. I just scanned it more closely and I think it looks fine. I'd say this only depends on #32 now. Looks like we need someone to look at codemeta/codemeta#237, codemeta/codemeta#238, and codemeta/codemeta#239 too.

@moranegg
Copy link
Contributor

moranegg commented Sep 7, 2023

Keeping this for after the #45 merge.

@moranegg moranegg closed this in #45 Sep 8, 2023
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.

4 participants