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

Fixup src/VERSION.txt added in #30912 #31357

Closed
mkoeppe opened this issue Feb 8, 2021 · 16 comments
Closed

Fixup src/VERSION.txt added in #30912 #31357

mkoeppe opened this issue Feb 8, 2021 · 16 comments

Comments

@mkoeppe
Copy link
Contributor

mkoeppe commented Feb 8, 2021

The mistake made in #30912 broke the direct use of src/setup.py. (Did not affect normal build.)

Depends on #30912

CC: @jhpalmieri @tobiasdiez @isuruf

Component: build

Author: Matthias Koeppe

Branch/Commit: 043d3ab

Reviewer: John Palmieri

Issue created by migration from https://trac.sagemath.org/ticket/31357

@mkoeppe mkoeppe added this to the sage-9.3 milestone Feb 8, 2021
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 8, 2021

@mkoeppe

This comment has been minimized.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 8, 2021

Commit: c16651c

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 8, 2021

Last 10 new commits:

2a91862build/pkgs/sagelib/src/README.rst: Add some text
6432727Merge tag '9.3.beta2' into t/30912/sagelib__update_metadata_for_pypi_deployment
4a693f2Move build/pkgs/sagelib/src/setup.cfg to SAGE_ROOT/src, replace by symlink
ea182d7Copy changes from build/pkgs/sagelib/src to src
a1a10b9src/VERSION.txt: New
5697335src/setup.cfg: Add license_file=LICENSE.txt
deb9eb3Merge tag '9.3.beta3' into t/30912/sagelib__update_metadata_for_pypi_deployment
7ad4c0eMerge tag '9.3.beta4' into t/30912/sagelib__update_metadata_for_pypi_deployment
bdb2237Merge branch 't/30912/sagelib__update_metadata_for_pypi_deployment' into t/31357/fixup_src_version_txt_added_in__30912
c16651csrc/VERSION.txt: Use same format as build/pkgs/sagelib/src/VERSION.txt

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 8, 2021

Author: Matthias Koeppe

@jhpalmieri
Copy link
Member

comment:3

So we're going to have the version recorded in another non-auto-generated file?

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 10, 2021

comment:4

It is auto-generated by src/bin/sage-update-version

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 10, 2021

comment:5

This file needs to be there at the time that one would prepare an sdist of the Sage library - which is by the end of bootstrap.
In the current implementation, all version files are updated using this script and checked in to git by the release manager when preparing a release.

@jhpalmieri
Copy link
Member

comment:6

Should the symlink build/pkgs/sagelib/src/VERSION.txt point to SAGE_ROOT/src/VERSION.txt? Or maybe to ../package-version.txt? Right now it's pointing to the nonexistent SAGE_ROOT/src/package-version.txt.

In the sage-update-version script, the file SAGE_ROOT/src/bin/VERSION.txt is written. Should that instead be SAGE_ROOT/src/VERSION.txt?

I'm basically really confused about the different version files.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 10, 2021

comment:7

Thanks for catching these mistakes... I'll fix it up

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 10, 2021

Branch pushed to git repo; I updated commit sha1. New commits:

043d3abFixup version files/symlinks

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 10, 2021

Changed commit from c16651c to 043d3ab

@jhpalmieri
Copy link
Member

Reviewer: John Palmieri

@jhpalmieri
Copy link
Member

comment:9

Thanks for the fixes. I think this is okay.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 10, 2021

comment:10

Thank you!

@vbraun
Copy link
Member

vbraun commented Mar 1, 2021

Changed branch from u/mkoeppe/fixup_src_version_txt_added_in__30912 to 043d3ab

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants