Identify each branch and make a plan for them

Question

Identify each branch and make a plan for them

Closed this issue 3 years ago · 18 comments

Answer 1 · 2022-06-06T18:59:54.000Z

github_prep was already merged at 5f0c3cbc8befd03cf92b189beb8db1eabf385f56 but github doesn't recognize?

Answer 2 · 2022-06-06T19:00:29.000Z

implement_pytest was already merged at 79d27c253a3013d5da65ca01e4b65d2c9924f5fa, again GitHub does not recognize?

Answer 3 · 2022-06-06T19:02:23.000Z

updating-zhz-latex-generator was already merged at c483c91364a029291e9dbcf55c5b508dc936855f (and then later into master) Github doesn't recognize

Answer 4 · 2022-06-08T03:01:49.000Z

temp_file_naming, looks like this was used to store the naming scheme:

# DEBUG - temporary override
    maximum_h_rank, maximum_cc_rank, maximum_T_rank, eT_taylor_max_order, omega_max_order = truncations
    path = "./eT_zhz_eqs"
    path += f"_H({maximum_h_rank})"
    path += f"_P({omega_max_order})"
    path += f"_T({maximum_T_rank})"
    path += f"_exp({eT_taylor_max_order})"
    path += f"_Z({maximum_cc_rank})"
    path += ".py"

Answer 5 · 2022-06-08T03:04:07.000Z

finish_code_eTzhz, was last split into temp_file_naming branch, contains modifications to the naming of python functions:

ex commit: Improve docstrings for add_*_terms() style functions

when compared with master contains mostly docstring changes to produced python code but also contains some new flags so might need to be carefully cherrypicked before it is merged

Answer 6 · 2022-06-08T03:09:50.000Z

LHS_generation: 52 additions and 28 deletions when compared to master

seems to contain some useful modifications to latex but also looks like it clashes in some spots with the LHS gen stuff we have more recently worked on

Answer 7 · 2022-06-08T03:10:52.000Z

implement_pytest, already merged can probably just delete

Answer 8 · 2022-06-08T03:12:18.000Z

older_latex_branch
seems to be backup of old generator code
contains:

older_latex_generator.py
generated_latex.txt

Answer 9 · 2022-06-08T03:13:17.000Z

remove_old_functions_fix was merged into remove_old_functions

Answer 10 · 2022-06-08T03:20:43.000Z

remove_old_functions only dif from master is generate_residual_equations.py which is depreciated

Answer 11 · 2022-06-08T03:23:49.000Z

remove_prints was also merged since only dif from master is generate_residual_equations.py which is depreciated

Answer 12 · 2022-06-08T03:25:26.000Z

aug25_ansatz branch contains changes to latex_eT_zhz.py that contains some possibly useful naming changes

Answer 13 · 2022-06-08T03:31:12.000Z

testing_pipeline was merged, no changes vs master

Answer 14 · 2022-06-08T03:32:41.000Z

updating_code_generator was merged into updating-zhz-latex-generator which was merged into implement_pytest which made its way into master at some point around 9bdab69

Answer 15 · 2022-06-08T18:29:54.000Z

Google best practice for old stale branches, merge/not merge?, but still want to record commits?
Maybe just cherry pick the useful ones into a new branch off the current master branch?

Answer 16 · 2022-06-08T18:32:45.000Z

This might be relevant https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository

Answer 17 · 2022-06-08T20:32:55.000Z

We can now remove older_latex_branch since I've made a gist of the only files that matter for it:
https://gist.github.com/ngraymon/efd7b55a0e57c32b6d6c5e2a13c76d10

Answer 18 · 2022-06-08T21:19:34.000Z

Leaving old_master for a week or two incase something weird happens.
storage_generated_einsum_code will stay for now