This gist provides a minimal setup and example of the git collaborate exercise for SWC (e.g., here). Use setup.sh to get a minimal working repository example. A repos represent the master upstream version, B and C repos represent forks. *-remote directories represent Github repos (and forks), while ~*-local` directories correspond to local copies. exercise.sh goes through what students will see for both the PR execise and "experiencing a conflict".
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| def write(self): | |
| if len(self.data) >= self.chunksize: | |
| self.tbl.append(self.data[:self.chunksize]) | |
| self.data = self.data[self.chunksize:] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| a, b, c | |
| 1, 2, 3 | |
| 1.5, 2.5, 3.5 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| // class.cc | |
| #include "class.h" | |
| Foo::Foo() { i=1; } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # | |
| # A fatal error has been detected by the Java Runtime Environment: | |
| # | |
| # SIGSEGV (0xb) at pc=0x00007fd6610533ab, pid=10349, tid=140558724683520 | |
| # | |
| # JRE version: Java(TM) SE Runtime Environment (8.0_20-b26) (build 1.8.0_20-b26) | |
| # Java VM: Java HotSpot(TM) 64-Bit Server VM (25.20-b23 mixed mode linux-amd64 compressed oops) | |
| # Problematic frame: | |
| # C [sqlite-3.7.2-libsqlitejdbc.so+0x353ab] | |
| # |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| kpathsea: Running mktextfm texnansi-qplr+20 | |
| mktextfm: Running mf-nowin -progname=mf \mode:=ljfour; mag:=1; nonstopmode; input texnansi-qplr+20 | |
| This is METAFONT, Version 2.718281 (TeX Live 2013/Debian) | |
| kpathsea: Running mktexmf texnansi-qplr+20 | |
| ! I can't find file `texnansi-qplr+20'. | |
| <*> ...mag:=1; nonstopmode; input texnansi-qplr+20 | |
| Please type another input file name |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| def masked_collection(c, mask): | |
| """Return a subset of a collection with a mask applied""" | |
| return [c[i] for i in range(len(c)) if mask[i]] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| bax_ids = set(data_ch1.values()) | |
| cytc_ids = set(data_ch2.values()) | |
| both_ids = bax_ids | cytc_ids |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| pyne/__init__.py:10:5: F403 'from pyne_config import *' used; unable to detect undefined names | |
| pyne/__init__.py:13:80: E501 line too long (82 > 79 characters) | |
| pyne/api.py:2:1: F401 'nuc_data' imported but unused | |
| pyne/api.py:2:1: F401 'pyne_conf' imported but unused | |
| pyne/api.py:2:1: F401 'pyne_start' imported but unused | |
| pyne/api.py:5:1: F401 'id' imported but unused | |
| pyne/api.py:5:1: F401 'name' imported but unused | |
| pyne/api.py:6:1: W391 blank line at end of file | |
| pyne/binaryreader.py:14:1: E302 expected 2 blank lines, found 1 | |
| pyne/alara.py:4:1: F401 'os' imported but unused |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ====================================================================== | |
| FAIL: test_abi.test_abi_stability | |
| ---------------------------------------------------------------------- | |
| Traceback (most recent call last): | |
| File "/usr/lib/python2.7/dist-packages/nose/case.py", line 197, in runTest | |
| self.test(*self.arg) | |
| File "/home/gidden/work/cyclus/cyclus/tests/test_abi.py", line 32, in test_abi_stability | |
| assert_true(obs) | |
| AssertionError: False is not true | |
| -------------------- >> begin captured stdout << --------------------- |