learning from here: https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
Seems to make sense to update devel branch from master first...
This worked.
Also both master and devel branch pass build on Travis - GOOD!
Now try to merge branch....
https://www.attosol.com/create-and-merge-branches-using-github-desktop-client/
tells us to Create a Pull Request
Then:
Compare
Update
Sync
Wednesday, 3 January 2018
Tuesday, 2 January 2018
Addressing comments from Bioconductor...
A few relatively minor comments:
"Looks good. Just a couple of comments -
- LazyData: true
Any particular reason why you're setting this to 'true'? I ask because we've seen this cause problems (long delays) when loading packages with substantial data. My recommendation would be to leave this as 'False'. - Both httr and ggplot2 are imported in DESCRIPTION. They should be selectively or fully imported in the NAMESPACE."
Changing LazyData: false means adding data() functions before each command in examples as mentioned here: http://kbroman.org/pkg_primer/pages/data.html
No good reason not to do this so - DONE.
Using the Roxygen tags to @import ggplot2 and @import httr at the appropriate times changes the NAMESPACE in the appropriate way.
Advice here:
Once, I worked out how to do this - DONE.
So basically all done - testing and version bumping required.
Wednesday, 20 December 2017
Learning more about git: Reverting a commit...
Within github,
I want to try reverting to a version of drawProteins that passed build...
So the reversion seems to have worked.
Bumped to 0.99.5 to try to get a new build... don't know if it will be enough...
Currently being tested on Bioconductor and Travis... time for a cup of tea.
currently 13:54
So now I have created a branch in Github Desktop
However, how do I know I'm working on a branch?
So within Git Desktop there is the option to commit to 'master' or 'branch'
Great.
And there was a publish button at one point.
FROM NOW ON: only commit to devel until it works and builds - need separate build process, I think....
Travis will build automatically which is good.
I want to try reverting to a version of drawProteins that passed build...
So the reversion seems to have worked.
Bumped to 0.99.5 to try to get a new build... don't know if it will be enough...
Currently being tested on Bioconductor and Travis... time for a cup of tea.
currently 13:54
So now I have created a branch in Github Desktop
However, how do I know I'm working on a branch?
So within Git Desktop there is the option to commit to 'master' or 'branch'
Great.
And there was a publish button at one point.
FROM NOW ON: only commit to devel until it works and builds - need separate build process, I think....
Travis will build automatically which is good.
Monday, 18 December 2017
Trying to open Raspberry Pi SD card on a mac...
Tried:
https://www.engadget.com/2009/09/07/how-to-set-up-ubuntu-linux-on-a-mac-its-easy-and-free/
creating a Virtual Box
Downloaded ISO file from here:
https://www.raspberrypi.org/downloads/raspberry-pi-desktop/
This worked and gave me a nice raspberry pi version on the mac - very useful.
But still can't access the SD file...
This advice would be good but I can't really understand it...
https://www.engadget.com/2009/09/07/how-to-set-up-ubuntu-linux-on-a-mac-its-easy-and-free/
Sunday, 17 December 2017
Setting up a python script to run on Pi Zero on start up....
Between these two links:
https://www.raspberrypi.org/forums/viewtopic.php?p=921354#p921354
https://www.raspberrypi-spy.co.uk/2015/10/how-to-autorun-a-python-script-on-boot-using-systemd/
I managed to hack together a service file that uses `systemd`
- make a service script and then run on startup....
https://www.digitalocean.com/community/tutorials/how-to-use-systemctl-to-manage-systemd-services-and-units
maybe:
https://unix.stackexchange.com/questions/47695/how-to-write-startup-script-for-systemd
It seems that I might be able to start with Control C to prevent it running scripts.
Check tonight....
More about services here:
https://gist.github.com/drmalex07/d006f12914b21198ee43
http://www.sharats.me/posts/the-ever-useful-and-neat-subprocess-module/
This is interesting...
https://www.raspberrypi.org/forums/viewtopic.php?p=921354#p921354
https://www.raspberrypi-spy.co.uk/2015/10/how-to-autorun-a-python-script-on-boot-using-systemd/
I managed to hack together a service file that uses `systemd`
- make a service script and then run on startup....
https://www.digitalocean.com/community/tutorials/how-to-use-systemctl-to-manage-systemd-services-and-units
maybe:
https://unix.stackexchange.com/questions/47695/how-to-write-startup-script-for-systemd
It seems that I might be able to start with Control C to prevent it running scripts.
Check tonight....
More about services here:
https://gist.github.com/drmalex07/d006f12914b21198ee43
http://www.sharats.me/posts/the-ever-useful-and-neat-subprocess-module/
This is interesting...
Saturday, 2 December 2017
Python...
So it seems I need to learn a bit about python for home reasons.
Installing packages on the mac - use homebrew
https://penandpants.com/2012/02/24/install-python/
linux cheat sheet
https://www.cheatography.com/davechild/cheat-sheets/linux-command-line/#downloads
apt-get commands
https://www.tecmint.com/useful-basic-commands-of-apt-get-and-apt-cache-for-package-management/
Installing packages on the mac - use homebrew
https://penandpants.com/2012/02/24/install-python/
linux cheat sheet
https://www.cheatography.com/davechild/cheat-sheets/linux-command-line/#downloads
apt-get commands
https://www.tecmint.com/useful-basic-commands-of-apt-get-and-apt-cache-for-package-management/
Subscribe to:
Posts (Atom)