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

remove obsolete .zenodo.json* files, update CITATION.cff to fix zenodo/DOI #35666

Merged
merged 4 commits into from
Jun 11, 2023

Conversation

dimpase
Copy link
Member

@dimpase dimpase commented May 22, 2023

Our DOI creation/update via zenodo is broken again.

CITATION.cff overrides .zenodo.json, cf.

citation-file-format/citation-file-format#374

This will fix #35659

@dimpase
Copy link
Member Author

dimpase commented May 22, 2023

perhaps the version in CITATION.cff should be the upcoming version 10.1, not the current one.

@dimpase
Copy link
Member Author

dimpase commented May 22, 2023

perhaps we should generate CITATION.cff from a template, like we did for .zenodo.json

@fchapoton
Copy link
Contributor

perhaps the version in CITATION.cff should be the upcoming version 10.1, not the current one.

@fchapoton fchapoton closed this May 22, 2023
@fchapoton fchapoton reopened this May 22, 2023
@fchapoton
Copy link
Contributor

fchapoton commented May 22, 2023

sorry, wrong click, now undone. Yes, I would say creating the .cff file in the script would be nice.

Copy link
Contributor

@mkoeppe mkoeppe left a comment

Choose a reason for hiding this comment

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

LGTM

@vbraun
Copy link
Member

vbraun commented May 28, 2023

Merge conflict

@dimpase
Copy link
Member Author

dimpase commented May 28, 2023

I've rebased on top of 10.1.beta1.

@dimpase
Copy link
Member Author

dimpase commented May 28, 2023

@vbraun - Please merge this manually, if needed. The conflict you got is due to .zenodo.json generated and pushed automatically by the release script, so indeed you'll always get a merge conflict if you try doing this automatically, as this branch removes .zenodo.json completely.

An alternative is to split this into 2 PRs - the fist one removing automatic generation of zenodo.json, the second doing the rest. Please tell me your preference.

@vbraun
Copy link
Member

vbraun commented Jun 2, 2023

This breaks the tarball creation script

Creating upstream/configure-24ed284171ade0dc8de01fda1b2d5f9eeedf1520.tar.gz...
Updating checksum of configure (tarball configure-24ed284171ade0dc8de01fda1b2d5f9eeedf1520.tar.gz)
error: pathspec '/home/release/Sage/src/CITATION.cff' did not match any file(s) known to git
Error committing to the repository.
Traceback (most recent call last):
  File "/home/release/opt/bin/git-releasemgr", line 16, in <module>
    cmdline.launch()
  File "/home/release/opt/git-trac-command/git_trac/releasemgr/cmdline.py", line 189, in launch
    app.release(args.version, check=args.check)
  File "/home/release/opt/git-trac-command/git_trac/releasemgr/app.py", line 409, in release
    update_version(version)
  File "/home/release/opt/git-trac-command/git_trac/releasemgr/make_release.py", line 12, in update_version
    check_call(['sage', '-sh', '-c', 'sage-update-version {0}'.format(version)])
  File "/home/release/opt/conda/lib/python2.7/subprocess.py", line 190, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sage', '-sh', '-c', 'sage-update-version 10.1.beta2']' returned non-zero exit status 1

@dimpase
Copy link
Member Author

dimpase commented Jun 3, 2023

oops,

    "$SAGE_SRC/CITATION.cff" \

should be SAGE_ROOT, not SAGE_SRC

@dimpase
Copy link
Member Author

dimpase commented Jun 3, 2023

@vbraun - should be fixed now.

@vbraun
Copy link
Member

vbraun commented Jun 3, 2023

Merge conflict

@dimpase
Copy link
Member Author

dimpase commented Jun 4, 2023

@vbraun - rebased again. Please merge manually, cf #35666 (comment)

@github-actions
Copy link

github-actions bot commented Jun 4, 2023

Documentation preview for this PR (built with commit 532b0de) is ready! 🎉

@vbraun vbraun merged commit 7e0eb1c into sagemath:develop Jun 11, 2023
@mkoeppe mkoeppe added this to the sage-10.1 milestone Jun 11, 2023
dimpase added a commit to dimpase/sage that referenced this pull request Aug 24, 2023
this is a leftover from sagemath#35666 which was somehow created during a messy manual merge.
@dimpase dimpase mentioned this pull request Aug 24, 2023
vbraun pushed a commit to vbraun/sage that referenced this pull request Aug 27, 2023
    
this is a leftover from sagemath#35666 which was somehow created during a messy
manual merge.

This hopefully finally will unbreak our Zenodo integration
    
URL: sagemath#36132
Reported by: Dima Pasechnik
Reviewer(s): Matthias Köppe
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

zenodo broken again, since Sage 9.8
5 participants