Menu
▾
▴
Re: [scipion-users] Separate protocols update in the Scipion dev
|
From: Jose M. de la R. T. <del...@gm...> - 2017-04-14 08:19:35
|
Hi David, It seems like you have some local modifications to the files: SConstruct software/em/xmipp/scipion_sconscript Can you post the output of the command 'git diff', this should show the modifications of these files, that could be some tweaks to make Scipion/Xmipp compile in your system. It would be good to check if the modifications is something particular or a fix that have been included in the more recent code. Anyway, you can "store" the changes temporary by doing: 'git stash', then getting the latest changes: 'git pull', and if needed, restore back the changes: 'git stash pop' And if there are not conflicts you can proceed with the './scipion install -j 6'. Although you may also update your config files with a './scipion config --update' Maybe we should add this instruction in a wikipage since I guess more users will need this information. Kind regards, Jose Miguel On Fri, Apr 14, 2017 at 5:55 AM, David Belnap <db...@co...> wrote: > Pablo, > > I tried to update my installation of Scipion (v1.0.1) to the release-1.1 > branch by following the instructions below. I did “git pull” and > “./scipion install -j 6” before I noticed the message below. When I did > “git checkout release-1.1”, I get the following error message: > > $ git checkout release-1.1 > error: Your local changes to the following files would be overwritten by > checkout: > SConstruct > software/em/xmipp/scipion_sconscript > Please, commit your changes or stash them before you can switch branches. > Aborting > > What should I do to get past this problem? > > Thanks. > > David Belnap > > > On Mar 10, 2017, at 7:32 AM, Dmitry A. Semchonok <sem...@gm...> > wrote: > > Dear Pablo, > > I'm now at the particle picking stage. > > We applied the fix for that updates of the protocols in the SCIPION 1.1. > The problem still remains - some particles i can not delete pressing > shift+left mouse button. But i noticed that if i use only the eraser tool > then i can delete all the selections. > > Sincerely, > Dmitry > Hi Dmitry, did this worked? > > All the best, Pablo. > Scipion team > > Activo Mar, 7 Marzo at 10:42 AM , Pablo Conesa < > su...@bc...> Escrito: > Hi Dmitry, > > May I recomend you to switch to release-1.1 branch. Reasons are: > > Now devel and release-1.1 are almost similar. Differences are that release > has more activity and bugfixes are pushed first to release-1.1 and after a > while they end up un devel. Like in this case for the picking bug that is > not yet in devel but soon will be. > > You will also help us to test the future release while using it. > > To do so, follow Jose Miguel steps but switch to release-1.1: > > > *git pull # *and this should bring the changes...and release-1.1 branch > if not yet local. > > *git checkout release-1.1 *#This switches you to release-1.1 branch > > *git pull *# Again, this might not be needed, but I use to do it to be > sure I have the latest changes. > *scipion install -j N *# replace N by an integer, it means how many CPUs > you want to use to compile > > scipion install is optimized and will only compile what has changed and EM > packages are not reinstall. It should not take long. > > Let us know how it goes? > > All the best, Pablo. > > > Activo Lun, 6 Marzo at 5:08 PM , Dmitry Semchonok <sem...@gm...> > Escrito: > Dear colleagues, > > If there an easy way to update the xmipp - particle picking protocol in > Scipion_dev (or any other protocol inside Scipion dev that was bug fixed) > without reinstalling everything? > > Sincerely, > > Dmitry > > > > ------------------------------------------------------------ > ------------------ > Check out the vibrant tech community on one of the world's most > engaging tech sites, SlashDot.org <http://slashdot.org>! > http://sdm.link/slashdot > _______________________________________________ > scipion-users mailing list > sci...@li... > https://lists.sourceforge.net/lists/listinfo/scipion-users > > 52 > ------------------------------------------------------------ > ------------------ > Announcing the Oxford Dictionaries API! The API offers world-renowned > dictionary content that is easy and intuitive to access. Sign up for an > account today to start using our lexical data to power your apps and > projects. Get started today and enter our developer competition. > http://sdm.link/oxford_______________________________________________ > scipion-users mailing list > sci...@li... > https://lists.sourceforge.net/lists/listinfo/scipion-users > > > > ------------------------------------------------------------ > ------------------ > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > _______________________________________________ > scipion-users mailing list > sci...@li... > https://lists.sourceforge.net/lists/listinfo/scipion-users > > |
