@@ -5,13 +5,12 @@ A workflow for updating libEnsemble on Spack
55
66This assumes you have already:
77
8- - made a PyPI package for new version of libEnsemble and
8+ - made a PyPI package for the new libEnsemble version and
99 - made a GitHub fork of Spack and cloned it to your local system.
1010
1111Details on how to create forks can be found at https://help.github.com/articles/fork-a-repo.
1212
13- You now have a configuration like that shown at (but without the upstream/local connection).
14- https://stackoverflow.com/questions/6286571/are-git-forks-actually-git-clones.
13+ You now have a configuration like that shown at https://stackoverflow.com/a/6286877/6346040.
1514
1615Upstream, in this case, is the official Spack repository on GitHub. Origin is
1716your fork on GitHub, and Local Machine is your local clone (from your fork).
@@ -33,7 +32,7 @@ To set upstream repo::
3332 git remote set-url --push upstream no_push
3433 git remote -v # Check for line: `upstream no_push (push)`
3534
36- Updating (the main develop branch)
35+ Updating (the develop branch)
3736----------------------------------
3837
3938You will now update your local machine from the upstream repo (if in doubt,
@@ -54,16 +53,17 @@ Fetch from the upstream repo::
5453To update your local machine, you may wish to rebase or overwrite your local files.
5554Select from the following:
5655
57- If you have local changes to go "on top" of latest code ::
56+ Now make your local machine identical to the upstream repo (** WARNING: ** Any local changes will be lost!) ::
5857
59- git rebase upstream/develop
58+ git reset --hard upstream/develop
6059
61- Or to make your local machine identical to upstream repo (**WARNING: ** Any local changes will be lost!)::
60+ Alternatively, if you have existing local changes to go "on top" of the latest
61+ code (usually we will make our release updates after this)::
6262
63- git reset --hard upstream/develop
63+ git rebase upstream/develop
6464
6565(Optional) You may want to update your forked (origin) repo on GitHub at this point.
66- This may requires a forced push::
66+ This may require a forced push::
6767
6868 git push origin develop --force
6969
@@ -84,11 +84,11 @@ Quick example to update libEnsemble
8484This will open the libEnsemble ``package.py `` file in your editor (given by
8585environment variable ``EDITOR ``)::
8686
87- spack edit py-libensemble # SPACK_ROOT must be set (see above) (python packages use "py-" prefix)
87+ spack edit py-libensemble # SPACK_ROOT must be set (see above) (Python packages use "py-" prefix)
8888
8989Or just open it manually: ``var/spack/repos/builtin/packages/py-libensemble/package.py ``.
9090
91- Now get checksum for new lines:
91+ Now get the checksum for new lines:
9292
9393Get the tarball (see PyPI instructions), for the new release and use::
9494
@@ -102,13 +102,13 @@ Check package::
102102
103103 spack style
104104
105- This will install a few python spack packages and run style checks on just
105+ This will install a few Python Spack packages and run style checks on just
106106your changes. Make adjustments if needed, until this passes.
107107
108108If okay - add, commit, and push to origin (forked repo). For example, if your version
109- number is 0.9.1 ::
109+ number is 1.2.2 ::
110110
111- git commit -am "libEnsemble: add v0.9.1 "
111+ git commit -am "libEnsemble: add v1.2.2 "
112112 git push origin develop --force
113113
114114Once the branch is pushed to the forked repo, go to GitHub and do a pull request from this
@@ -117,7 +117,7 @@ branch on the fork to the develop branch on the upstream.
117117Express Summary: Make Fork Identical to Upstream
118118------------------------------------------------
119119
120- Quick summary for bringing develop branch on forked repo up to speed with upstream
120+ Quick summary for bringing the develop branch on a forked repo up to speed with upstream
121121(YOU WILL LOSE ANY CHANGES)::
122122
123123 git remote add upstream https://github.com/spack/spack.git
0 commit comments