@@ -5,7 +5,7 @@ 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.
@@ -32,7 +32,7 @@ To set upstream repo::
3232 git remote set-url --push upstream no_push
3333 git remote -v # Check for line: `upstream no_push (push)`
3434
35- Updating (the main develop branch)
35+ Updating (the develop branch)
3636----------------------------------
3737
3838You will now update your local machine from the upstream repo (if in doubt,
@@ -53,12 +53,12 @@ Fetch from the upstream repo::
5353To update your local machine, you may wish to rebase or overwrite your local files.
5454Select from the following:
5555
56- Now make your local machine identical to upstream repo (**WARNING: ** Any local changes will be lost!)::
56+ Now make your local machine identical to the upstream repo (**WARNING: ** Any local changes will be lost!)::
5757
5858 git reset --hard upstream/develop
5959
60- Alternativvely , if you have existing local changes to go "on top" of latest code (usually we will
61- make our release updates after this)::
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
6363 git rebase upstream/develop
6464
@@ -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,7 +102,7 @@ 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
@@ -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