updated ssh connection via public key for mujpy
update covid https://github.com/pcm-dpc/COVID-19
The top is new commands to interact with the git muesr repository at Bonfus
Below that are the old instructions on how to setup and maintain
# first always:
git pull pietro master
# merge conflicts if not automatic (fast forward)
[git merge pietro/master]
# then work on the files
git pull pietro master
# make sure that collab did not wok in the meanwhile, git merge pietro/master if they did!
git add ...
git commit -m "comment"
git push pietro master
# STARTUP
git remote add pietro https://github.com/bonfus/muesr.git
git remote -v
git remote add origin https://github.com/RDeRenzi/muesr.git
git remote -v
# add the bonfus repository as pietro, the RDeRenzi as origin and show all
git fetch pietro master
# pietro is the local name for bonfus on github
# origin is the local name for my branch RDeRenzi on github
# download the whole master project
git merge pietro/master
# merge it to the local project
# if you get the following error message
CONFLICT (content): Merge conflict in dir/filename.spec
Automatic merge failed; fix conflicts and then commit the result.
# then cd to dir and run meld filename.spec filename.spec.orig (check before with ls)
# inspect accept or otherwise the changes. If you accept new version entirely, simply exit and rm filename.spec.orig
git add dir/filename.spec
git commit -m " Merge conflicts fixed etc"
# this fixes the conflict
# now move on
git checkout gui
# move to the gui branch (subproject)
git pull origin gui
# fetch and merge remote (origin) branch gui into local branch gui
# at this stage we realized that we merged into the wrong branch, because gui did not exist locally
# SECOND attempt, corrections
git log
# this lists the last operations, each with a long identifier
git reset --hard 3600918383816bfc1bb5b5a4a05a59d8fd2b5af2
# this cancels the pull
git status
git checkout -b gui
# create and move to a new branch gui
git pull origin gui
# redo this but in the right place
# NOW RUN muesr
export PYTHONPATH=/home/roberto.derenzi/muesr:$PYTHONPATH
# to add muesr to PYTHONPATH
# this is now in /home/roberto.derenzi/.profile
python muesr/rungui.py
# to run muesr (N.B. from the root gui/muesr directory)
python3 muesr/rungui.py
# same under python3
# NOW build library
git status
git fetch pietro gui
git merge pietro/gui
# update after a correction by Pietro
python setup.py build
# to make build/lib.linux-x86_64-2.7/lfcext.so
cp build/lib.linux-x86_64-2.7/lfcext.so muesr/
# to install the c library in ~/muesr/muesr
python setup.py install
#to install system-wide
#ipyth to run from shell
python muesr/rungui.py
# to run the gui with newest muesr
# MERGE LATEST CORRECTION FROM PIETRO
git status
# shows that I am still in branch gui
git checkout master
# move to branch master
git status
# check that
git fetch pietro master
git merge pietro/master
# merge latest corrections from Pietro
git pull origin patch-1
# fetch and merge latest mods made on github by editing Pietro's Intro.rst on the browser
# that produced a branch patch-1 on RDeRenzi containig those mods
# since I have no permission on the master branch of bonfus
# NOW PUSH THE WORK DONE ON pc34 to RDeRenzi on github
git checkout master
# make sure I'm on branch master on github
git push origin master
# to origin from master
# TO COMPILE rst files
sudo pip install sphinx
sudo pip install sphinx_rtd_theme
make html
ls _build/html/
# COMMITTING AND PUSHING latest mods on Intro.rst
git status
# file Intro.rst was edited with gedit, now the status is red, mod recognised but unacknowledged
git add -u
# update git, now the status is green, nothing is asked
git status
git commit
# officially register locally, a comment is asked for, Nano opens
git status
git commit -e
# as above but input is from command line, no Nano
git push
git status
git log
#
git commit -m "this is a minor edit" docs/Install.rst
# after having corrected typos in file Install. rst, make the corrected file known to local git
- extract a past version of a module from an older commit
