Opened 7 years ago

Closed 6 years ago

Last modified 4 years ago

#13015 closed task (fixed)

Metaticket: revamp workflow / switch to git

Reported by: kini Owned by: jason
Priority: major Milestone: sage-6.0
Component: misc Keywords: git workflow, sd51
Cc: mderickx, jdemeyer, roed, ohanar, robertwb, burcin, ppurka, saraedum, leif, dimpase Merged in:
Authors: Reviewers:
Report Upstream: N/A Work issues:
Branch: u/hivert/master (Commits) Commit: 68680e9999bf9934cd49630ee38440502cc5ab95
Dependencies: #15517, #14968, #15472, #15468, #15469, #15465, #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14962, #15241, #15222, #15221 Stopgaps:

Description (last modified by vbraun)

We plan to revamp the development workflow for Sage, involving a few separate (big) changes:

  • switch to git 
  • consolidate our repositories into a single repository
  • simplified development interface

We break down the steps needed for this transition in the following tasks/tickets:

  • #14480 - switch to new directory layout and update build system
  • #14481 - write a new developer manual; see https://github.com/sagemath/git-developer-guide
  • #14482 - write development scripts
  • Make sure the patchbot works with the new layout (this seems to be okay).
  • Make sure the buildbot works with the new layout (VB: works now)
  • #14962 - Make sure optional spkgs work with the new layout.
  • #15241 - ignore various temporary files
  • #15222 - make download to download all tarballs
  • #15221 - always rebuild packages if the version number changes
  • #15401 - Build git without gettext if necessary
  • #15420 - Borken git doctests.
  • #15430 - Enable cython caching
  • #15436 - Cksum uses tabs instead of spaces, breaking sage-spkg's regex
  • #15458 - "make distclean" fails on Solaris
  • #15465 - Allow using Sage without git repository
  • #15468 - update to latest upstream git
  • #15469 - Symmetrica spkg-check fails due to whitespace
  • #15472 - Fixes for the source tarball generation (sage -sdist)
  • #14968 - Store actual tarball name in pkg metadata.
  • #15517 - Run sage-upgrade *outside* of the Sage shell

Instructions for using the new workflow: QuickStartSageGit

Change History (64)

comment:1 Changed 7 years ago by kini

  • Cc jdemeyer added

comment:2 Changed 7 years ago by kini

  • Milestone set to sage-6.0

comment:3 Changed 7 years ago by ppurka

  • Cc ppurka added

comment:4 Changed 7 years ago by kini

  • Description modified (diff)

comment:5 Changed 7 years ago by saraedum

  • Cc saraedum added

comment:6 Changed 7 years ago by ohanar

  • Dependencies set to #9906, #11080

comment:7 Changed 7 years ago by jdemeyer

  • Dependencies changed from #9906, #11080 to #12938, #9906, #11080

comment:8 Changed 7 years ago by ohanar

  • Dependencies changed from #12938, #9906, #11080 to #9906, #11080

Those four spkgs are treated differently in the git layout, so the current (or future) spkg-install scripts are irrelevant.

comment:9 Changed 7 years ago by ohanar

  • Dependencies changed from #9906, #11080 to #9906, #11080, #13123

comment:10 Changed 7 years ago by ohanar

  • Cc was removed
  • Dependencies changed from #9906, #11080, #13123 to #9906, #11080, #13031, #13032, #13123, #13432

comment:11 Changed 7 years ago by ohanar

  • Description modified (diff)

comment:12 Changed 7 years ago by ohanar

  • Dependencies changed from #9906, #11080, #13031, #13032, #13123, #13432 to #9906, #11080, #13031, #13032, #13123, #13432, #13448

comment:13 Changed 7 years ago by ohanar

  • Description modified (diff)

comment:14 Changed 7 years ago by robertwb

  • Dependencies changed from #9906, #11080, #13031, #13032, #13123, #13432, #13448 to #9906, #11080, #13031, #13032, #13123, #13432, #13448, #14372

comment:15 Changed 7 years ago by ohanar

  • Dependencies changed from #9906, #11080, #13031, #13032, #13123, #13432, #13448, #14372 to #9906, #11080, #13031, #13032, #13123, #13432, #13448, #14372, #14226, #14316, #14331

These are the patches that I'm importing that are not merged in 5.9.beta1: #14226, #13031, #14316, #14331.

So those are the most vital.

comment:16 Changed 6 years ago by ohanar

  • Dependencies changed from #9906, #11080, #13031, #13032, #13123, #13432, #13448, #14372, #14226, #14316, #14331 to #9906, #11080, #13031, #13032, #13123, #13432, #14226, #14316, #14331, #14480, #14481, #14482

comment:17 Changed 6 years ago by leif

  • Cc leif added

comment:18 Changed 6 years ago by nthiery

  • Description modified (diff)

comment:19 Changed 6 years ago by tkluck

  • Dependencies changed from #9906, #11080, #13031, #13032, #13123, #13432, #14226, #14316, #14331, #14480, #14481, #14482 to #14480, #14481, #14482, #14330, #14273, #14954

Updating dependencies field to remove circular dependencies etc.

comment:20 Changed 6 years ago by tkluck

  • Branch set to u/tkluck/master
  • Keywords sd51 added

I'm adding a branch to this that is just the merge of all dependencies.

comment:21 Changed 6 years ago by tkluck

  • Branch changed from u/tkluck/master to public/sage-git/master

comment:22 Changed 6 years ago by tkluck

  • Dependencies changed from #14480, #14481, #14482, #14330, #14273, #14954 to #14480, #14481, #14482, #14330, #14273, #14954, #14962

comment:23 Changed 6 years ago by git

  • Commit set to d8713eb90042a1e879cf8e8999f3ab8a40f1e292

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

[changeset:d8713eb]Merge remote-tracking branch 'origin/build_system' into public/sage-git/master

comment:24 Changed 6 years ago by roed

  • Description modified (diff)

comment:25 Changed 6 years ago by git

  • Commit changed from d8713eb90042a1e879cf8e8999f3ab8a40f1e292 to b890215d378b8cdcd960bceeb79f4cdc849b8d66

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

[changeset:b890215]Merge branch 'ticket/14482' into public/sage-git/master
[changeset:6bb1502]Fixing doctests and adding some coverage
[changeset:90d7a64]Fix some doctest problems
[changeset:393d8bb]Fix a bug in unstash
[changeset:4281985]Merge branch 'u/saraedum/ticket/14482' of ssh://trac.sagemath.org:2222/sage into ticket/14482
[changeset:1183a8b]Fixing doctest errors, adding functions for changing status of tickets, making e-mail notifications happen
[changeset:348e0a0]"dependencies" is not a valid name for a branch since this is a special keyword for merge().
[changeset:e793b41]Implemented 'dependencies' in merge()
[changeset:9569608]Several trivial doctest fixes in sage dev scripts.
[changeset:fa96127]Delete dependencies when abandoning a ticket.
[changeset:736295c]Stashes were printed twice by unstash()
[changeset:7191281]Merge branch 'u/roed/ticket/14482' of ssh://trac.sagemath.org:2222/sage into ticket/14482
[changeset:d7b6620]Changed the default behaviour for merge() with respect to remote branches.
[changeset:cfc472d]Fixed _is_remote_branch_name when exists!=None.
[changeset:c0648c7]Update documentation of import_patch and download_patch
[changeset:b38fe65]Merge branch 'stash/1' into ticket/14482
[changeset:8b48c3c]Fix some typos
[changeset:aa642da]Merge branch 'u/saraedum/ticket/14482' of ssh://trac.sagemath.org:2222/sage into ticket/14482
[changeset:4aebcfa]Changes stashed by reset_to_clean_working_directory()
[changeset:fdaa995]More error checking on ticket edits, add a set_attributes function
[changeset:51c04ac]Use --work-tree in git_interface.
[changeset:a36c492]Fixed an optional internet doctest in sagedev.
[changeset:38636b0]Fix typo in unstash
[changeset:4828a9a]Revert "Make sure we do not touch files outside of sage in the dev scripts."
[changeset:ae2fde5]Fixed edit_ticket().
[changeset:03cd3fd]Fixed import_patch()
[changeset:15d9e77]Fixing typos, making small changes
[changeset:9e3a961]Fixed a question in import_patch()
[changeset:0b04731]Fixed a typo in import_patch()
[changeset:a625996]Fixed a typo in import_patch()
[changeset:f63d614]Removed a reference to /dev/shm/ from sagedev.py
[changeset:167fe88]Moved hg patch related methods to patch.py
[changeset:76b09f0]Make download_patch and import_patch download and apply patches like the patchbot does.
[changeset:73410f3]Fixed two typos in docstrings/comments
[changeset:6061772]fixed a TracConnectionError?() call
[changeset:f95ece6]Fixed two optional: internet tests
[changeset:6df1b96]Merge branch 'u/roed/ticket/14482' of ssh://trac.sagemath.org:2222/sage into ticket/14482
[changeset:4072ade]download() did not behave as advertised in the docstring
[changeset:5f85692]Fixed an incorrect help string in upload()
[changeset:453486f]Fixed an incorrect help string in download()
[changeset:979fcd4]Merge branch 'u/saraedum/ticket/14482' of ssh://trac.sagemath.org:2222/sage into ticket/14482
[changeset:c575cca]Added capability to view ticket info and comments via dev scripts
[changeset:8052e27]Make sure we do not touch files outside of sage in the dev scripts.
[changeset:f43d853]Corrected the _src directory in the git interface
[changeset:6b64c54]switch_ticket()/create_ticket() works with an unclean working directory in some cases.
[changeset:4275bbd]Fixed doctests if no user.name and user.email had been set in git
[changeset:e078628]Add a warning in upload() to not erase dependencies.
[changeset:51e2179]merge() fails when merging a ticket into itself
[changeset:ed8ed9d]Fixed an infinite recursion in download_patch().
[changeset:0f30605]Fixed a doctest for download_patch()
[changeset:d9d7fe4]Merge branch 'stash/1' into ticket/14482
[changeset:7c934d2]Changes stashed by reset_to_clean_working_directory()
[changeset:debc6ed]Added a doctest to sagedev which shows how to start afresh when working on a ticket.
[changeset:c68940a]Delete branch -> ticket association when abandon()ing a branch in sagedev.
[changeset:bc5ce5a]Moved much of the code of create_ticket() to switch_ticket()
[changeset:2167665]Make user interface for sagedev more tolerant.
[changeset:859987e]Forbid None, True, False as branch names
[changeset:7b0a041]Fall back to http if ssl is not available
[changeset:07dfcef]Be more verbose about whether a commit has been created or not in sagedev
[changeset:b8c78f2]Hide git debug messages per default in sagedev.
[changeset:1ba2a7a]fixed a typo in sagedev.py
[changeset:a9c8a91]Merge branch 'build_system' into dev_scripts
[changeset:5adc4a4]Store the data of the SavingDicts? of SageDev? in .git
[changeset:957a415]Small fix to legacy support for SavingDicts? in SageDev?
[changeset:8b0d31e]Fixed a doctest in trac_interface.py
[changeset:b8dccf1]SavingDicts? for SageDev? are now stored in the working tree
[changeset:c66bdfd]fixed two problems in SageDev?.commit()
[changeset:a773f54]Merge branch 'build_system' into ticket/14482

comment:26 Changed 6 years ago by git

  • Commit changed from b890215d378b8cdcd960bceeb79f4cdc849b8d66 to 1456c52f00755571f2b19c1925e484ecce19e2d2

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

[changeset:1456c52]Merge branch 'ticket/14482' into public/sage-git/master
[changeset:6a43499]Do not show summaries per default in local_tickets() because this might be very slow for some.
[changeset:6a38888]make vanilla() return to the master branch in the dev scripts
[changeset:88ba93b]Display param=True parameters correctly in help string for sagedev.
[changeset:bc1b755]Improved local_tickets() to show the current branch and summary of the local tickets.
[changeset:37c477a]Fixed a help message for upload().
[changeset:c2902bb]Improve diff() against 'dependencies'
[changeset:9e4a92c]Added _is_master_uptodate() to dev scripts
[changeset:cc0ba9f]Made remote_status() more usable.
[changeset:4874050]import_patch() used non-existing parameter quiet for reset_to_clean_working_directory()
[changeset:ebdfb53]Fixed a problem in the dev scripts when user's config is incomplete.
[changeset:af4bfa2]Added a --profile switch to dev scripts.
[changeset:095db64]Use anonymous git access when possible.
[changeset:2e4b70b]Updated the anonymous repository sage.env
[changeset:ad04f8d]Fixing some problems in unstash
[changeset:98c0f6c]Bugfixes to import_patch

comment:27 Changed 6 years ago by git

  • Commit changed from 1456c52f00755571f2b19c1925e484ecce19e2d2 to 3b15578530c5f0e8d904bfbe3bc885f1258fbcb4

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

[changeset:3b15578]Merging Sage-5.12.beta5, newest dev scripts, and the doctest fixes.
[changeset:e11727c]revert the change to .gitignore
[changeset:6912669]Fix --new option for doctests.
[changeset:98d0840]Fix doctest doctest due to directory restructure.

comment:28 Changed 6 years ago by vbraun

I'll be using public/sage-git/master as the base branch for SD53 this week. I just integrated Sage-5.12.beta, the newly-renamed dev scripts, and made sure all doctests pass.

Please don't break it during this week :-)

comment:29 Changed 6 years ago by vbraun

  • Dependencies changed from #14480, #14481, #14482, #14330, #14273, #14954, #14962 to #14480, #14481, #14482, #14330, #14273, #14954, #14962, #15241
  • Description modified (diff)

comment:30 Changed 6 years ago by vbraun

  • Dependencies changed from #14480, #14481, #14482, #14330, #14273, #14954, #14962, #15241 to #14480, #14481, #14482, #14330, #14273, #14954, #14962, #15241, #15222
  • Description modified (diff)

comment:31 Changed 6 years ago by git

  • Commit changed from 3b15578530c5f0e8d904bfbe3bc885f1258fbcb4 to 8237337b67a38c7e85f86d9f0e2678b308f4fe00

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

[changeset:8237337]Merging Sage-5.12.rc0 and sage-git fixes
[changeset:e136966]clean up temp file usage (always use SAGE_TMP)
[changeset:39d7a1f]fixed the optional - internet doctests
[changeset:11a8bf4]cleaning up temp file usage
[changeset:8d8aeb7]better display for SageDevValueError?
[changeset:934857e]more code cleanups, minor UI rephrasing
[changeset:b558576]renamed local-tickets -> tickets, prune-closed-tickets -> prune-tickets, misc fixes
[changeset:c9dcab2]more informational messages
[changeset:fc653db]rename git.reset_to_clean_workspace_directory to git.clean_wrapper
[changeset:4063373]more info messages, simplified user interface message formatting

comment:32 Changed 6 years ago by git

  • Commit changed from 8237337b67a38c7e85f86d9f0e2678b308f4fe00 to 07152d86acac873d9038386726bfff9e75e9b6c9

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

[changeset:07152d8]Merge important bugfix for dev scripts
[changeset:d2efc20]ensure that ticket_cache does not use Sage integer and improve error handling

comment:33 Changed 6 years ago by vbraun

  • Dependencies changed from #14480, #14481, #14482, #14330, #14273, #14954, #14962, #15241, #15222 to #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222
  • Description modified (diff)

comment:34 Changed 6 years ago by ohanar

  • Branch changed from public/sage-git/master to master
  • Commit changed from 07152d86acac873d9038386726bfff9e75e9b6c9 to 70cf4dd8b83d3ebd1b6aacc7e01e0ac2a11dda13

comment:35 Changed 6 years ago by vbraun

  • Dependencies changed from #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222 to #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221
  • Description modified (diff)

comment:36 Changed 6 years ago by dimpase

  • Cc dimpase added

comment:37 Changed 6 years ago by git

  • Commit changed from 70cf4dd8b83d3ebd1b6aacc7e01e0ac2a11dda13 to 0d00bf7418257f3abb3bfada1c3780720ef41d8d

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

[changeset:0d00bf7]Merge branch 'build_system'
[changeset:60d5a06][FIXUP] 5.13.beta0: update git specific files
[changeset:e26c2b4]Merge branch 'upstream' into build_system
[changeset:1fed88d]Merge 'sage-5.13.beta0'
[changeset:7b13761]5.13.beta0
[changeset:be32d3e]5.13.beta0
[changeset:c42af5f]5.12
[changeset:22d3a29]Trac #11273: Added min_mag arg to plot_spiderweb. Added 2 new doctests.
[changeset:6108c10]Trac #15250: upgrade to version 2.5.5.
[changeset:34c05cf]Trac #11273: Minor doc/polish fixes.

comment:38 Changed 6 years ago by git

  • Commit changed from 0d00bf7418257f3abb3bfada1c3780720ef41d8d to 40910d3d7f7780dbb30f3921709cc09502827c27

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

[changeset:40910d3]Merge sage-5.13.beta1
[changeset:7c5f2b8]Merge latest developement scripts
[changeset:952f7e3]fix doctest failure from bad merge conflict resolution
[changeset:9bd940c]resolve conflict with newest build_system
[changeset:ec4ed11][FIXUP] 5.13.beta1: update git specific files
[changeset:a23df3e]Merge branch 'upstream' into build_system
[changeset:b7dc123]Merge 'sage-5.13.beta1'
[changeset:8693e80]5.13.beta1
[changeset:755697a]5.13.beta1
[changeset:45b0ecd]lazy import dev scripts

comment:39 Changed 6 years ago by git

  • Commit changed from 40910d3d7f7780dbb30f3921709cc09502827c27 to 65c7744ed27c3f19ffde48cad600ca3209566743

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

[changeset:65c7744]Merge import bug fix for development scripts
[changeset:55ef287]fixed import statement for the commandline interface

comment:40 Changed 6 years ago by git

  • Commit changed from 65c7744ed27c3f19ffde48cad600ca3209566743 to 064df9f25ec6d075add84200748ad9e770d0af21

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

[changeset:064df9f]Merge branch 'build_system'
[changeset:874ba34][FIXUP] 5.13.beta2: update git specific files
[changeset:b3be83f]Merge branch 'upstream' into build_system
[changeset:f9cb799]Merge 'sage-5.13.beta2'
[changeset:33eb4e3]5.13.beta2
[changeset:b196e04]5.13.beta2
[changeset:c6801b5]#15312: Fix use of freed memory in Symmetrica - change to src/bruch.c
[changeset:839d8fe]#13413: fix integer overflow bug on 64-bit systems
[changeset:b600f12]Trac #15255: review patch : details
[changeset:6fae6aa]Trac #15255: Assign correct name to GridGraph?

comment:41 Changed 6 years ago by mderickx

  • Cc mderickx added

comment:42 Changed 6 years ago by git

  • Commit changed from 064df9f25ec6d075add84200748ad9e770d0af21 to f2491f18b488f64d2b1ebef3b2563ee6b7349797

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

[changeset:f2491f1]Trac #15221: Sage should re-build packages when versions change.
[changeset:63b3650]Trac #15222: "make download" target for sage
[changeset:ffbdc3f]Trac #15241: Add editor- and os-specific temporary files to .gitignore
[changeset:b5c6b09]fix doctest errors in SageDev?.push
[changeset:9e28043]remove (now) bad uses of SageDev?.pull
[changeset:78cf9f9]remove unused garbage
[changeset:f835534]dumb down pull to fix it
[changeset:d197b94]Merge branch 'master' into dev_scripts
[changeset:9f448b8]don't abort ticket editing on nop push
[changeset:fdb6cdc]remove last reference to download command

comment:43 Changed 6 years ago by git

  • Commit changed from f2491f18b488f64d2b1ebef3b2563ee6b7349797 to 35a8da551e7971265de96f9fab1c9c09ee195e6e

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

35a8da5Merge branch 'dev_scripts'
3880a5apatch.py: deal with hg's silly copy commands
6207777SageDev?: fix pull doctest
9785409SageDev?: remove branch keyword from pull

comment:44 Changed 6 years ago by git

  • Commit changed from 35a8da551e7971265de96f9fab1c9c09ee195e6e to 043199d7b4dab6e2ef958de682165e759be10d9a

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

043199dMerge potential doctest failure in the dev scripts
3a7e05bsage.dev: don't textwrap during doctesting

comment:45 Changed 6 years ago by git

  • Commit changed from 043199d7b4dab6e2ef958de682165e759be10d9a to 094712a285895ceac4c1521fb04cc9cc343a4b3a

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

094712aMerge in bug fixes for the dev scripts
f5f0ea4also remove untracked directories after an aborted import patch
ebb203ctrac_interface: encode fields with utf-8 as well

comment:46 Changed 6 years ago by vbraun

  • Dependencies changed from #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221 to #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221
  • Description modified (diff)

comment:47 Changed 6 years ago by git

  • Commit changed from 094712a285895ceac4c1521fb04cc9cc343a4b3a to f36d14a9cfae45333fcda5c0725f831c7c56a2cc

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

f36d14aMerge in sage-5.13.beta3
1b1d236[FIXUP] 5.13.beta3: update git specific files
8c24758Merge branch 'upstream' into build_system
68361b8Merge 'sage-5.13.beta3'
d8f20bb5.13.beta3
85b50995.13.beta3
f5796f2remove reference to sage/misc/hg from docbuild
524ba37#15268: let ncurses build on Solaris.
fdeccdaTrac #15268: Add new ncurses config file to .hgingore.
a7cd706Trac #15337: Speed up ulp() method, add epsilon() method, add field arguments

comment:48 Changed 6 years ago by ohanar

  • Dependencies changed from #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221 to #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221

comment:49 Changed 6 years ago by vbraun

  • Dependencies changed from #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221 to #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221
  • Description modified (diff)

comment:50 Changed 6 years ago by vbraun

  • Dependencies changed from #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221 to #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221
  • Description modified (diff)

comment:51 Changed 6 years ago by vbraun

  • Description modified (diff)

comment:52 Changed 6 years ago by vbraun

  • Dependencies changed from #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221 to #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221
  • Description modified (diff)

comment:53 Changed 6 years ago by git

  • Commit changed from f36d14a9cfae45333fcda5c0725f831c7c56a2cc to 0c6fcdf462e329c80eeaf2841ac1659308aad90c

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

0c6fcdfMerge in sage-5.13.beta4
47cb70d[FIXUP] 5.13.beta4: update git specific files
83ea767Merge branch 'upstream' into build_system
b27454aMerge 'sage-5.13.beta4'
d8b94385.13.beta4
7fa6d9b5.13.beta4
46ec651Trac #15402: fix eint1() precision
6d844cf#14706: fix visibility of symbols for built-in libintl.
79daab2#14706: Move previous install of R on OS X.
39238cd#14706: Add $SAGE_LOCAL/lib to LDFLAGS.

comment:54 Changed 6 years ago by vbraun

  • Dependencies changed from #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221 to #15465, #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221
  • Description modified (diff)

comment:55 Changed 6 years ago by vbraun

  • Dependencies changed from #15465, #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221 to #15468, #15469, #15465, #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221
  • Description modified (diff)

comment:56 Changed 6 years ago by vbraun

  • Dependencies changed from #15468, #15469, #15465, #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221 to #15472, #15468, #15469, #15465, #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221
  • Description modified (diff)

comment:57 Changed 6 years ago by vbraun

  • Dependencies changed from #15472, #15468, #15469, #15465, #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221 to #14968, #15472, #15468, #15469, #15465, #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221
  • Description modified (diff)

comment:58 Changed 6 years ago by vbraun

  • Dependencies changed from #14968, #15472, #15468, #15469, #15465, #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14330, #14273, #14962, #15241, #15222, #15221 to #14968, #15472, #15468, #15469, #15465, #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14962, #15241, #15222, #15221

comment:59 Changed 6 years ago by git

  • Commit changed from 0c6fcdf462e329c80eeaf2841ac1659308aad90c to 1e9e230bea1d4cd4681e71532fcd7be13fa20f3e

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

1e9e230Merge in sage-5.13.beta5
33dec52[FIXUP] 5.13.beta5: update git specific files
47de785Merge branch 'upstream' into build_system
0b16085Merge 'sage-5.13.beta5'
f7151105.13.beta5
dfdb3055.13.beta5
374a99d#14410: let ATLAS build shared libs on Cygwin.
b8fc170Trac #15385: cleanup of hadamard matrices
4f6874dTrac #15174: permutations multiplication order made more explicit and less of a minefield; also other fixes to permutation.py
b00bb0dTrac #13849: deprecate degrevlex

comment:60 Changed 6 years ago by git

  • Commit changed from 1e9e230bea1d4cd4681e71532fcd7be13fa20f3e to 4b0912c49fb468f2bec4c694fd776fdb723e1f15

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

4b0912cMerge in sage-5.13.rc0
cd237e7[FIXUP] 5.13.rc0: update git specific files
9fd8301Merge branch 'upstream' into build_system
12b4002Merge 'sage-5.13.rc0'
702cbc15.13.rc0
fb291325.13.rc0
0ad64abTrac #15433: define ACCELERATE on OS X
4f31c50Trac #15433: don't build sqlite on OS X 10.9
1b706ffTrac 15433: work around for incompatibility between g++ and an OS X header
c31654fTrac #15150: Implemented NCSym.

comment:61 Changed 6 years ago by vbraun

  • Dependencies changed from #14968, #15472, #15468, #15469, #15465, #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14962, #15241, #15222, #15221 to #15517, #14968, #15472, #15468, #15469, #15465, #15458, #15436, #15430, #15420, #15401, #14480, #14481, #14482, #14962, #15241, #15222, #15221
  • Description modified (diff)

comment:62 Changed 6 years ago by git

  • Commit changed from 4b0912c49fb468f2bec4c694fd776fdb723e1f15 to 68680e9999bf9934cd49630ee38440502cc5ab95

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

68680e9Updated Sage version to 6.0.rc0
93cd08fTrac #15440: Random spaces injected into Maxima pexpect output
ef54138Trac #14968: Store actual tarball name in pkg metadata.
b6b4adbupdated git checksum
a25d736updated R checksum
9d08fd5Trac #15472: Fixes for the source tarball generation (sage -sdist)
a73f7caTrac #15469: Symmetrica spkg-check fails due to whitespace
ee17952Trac #15468: update to latest upstream git
608159cTrac #15465: Allow using Sage without dev/git
e1a7d2aTrac #15458: "make distclean" fails on Solaris

comment:63 Changed 6 years ago by vbraun

  • Resolution set to fixed
  • Status changed from new to closed

All tickets are merged! woo-hoo ;-)

comment:64 Changed 4 years ago by hivert

  • Branch changed from master to u/hivert/master
Note: See TracTickets for help on using tickets.