Closed rdengate closed 9 years ago
Hi Rebecca,
There were a few small conflicts, so I merged this manually. I'm not convinced I totally nailed it, so you might want to just review the master branch at some point to check I got all your changes in. I think I got it mostly right but I did end up marking one of the tests in test_recalcitrant as xfail.
Thanks so much for all your help today.
-T
On Tue, Aug 5, 2014 at 4:36 PM, rebeccad notifications@github.com wrote:
Tests for random/reverse time series restored, and now handles single data
point and no data points gracefully.
You can merge this Pull Request by running
git pull https://github.com/tleeuwenburg/wordgraph fix_xtest_recalcitrant
Or view, comment on, or merge it at:
https://github.com/tleeuwenburg/wordgraph/pull/13 Commit Summary
- tests for random/reverse time series restored, and now handles single data point and no data points gracefully.
File Changes
- M tests/data/server_requests.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-0 (12)
- M tests/lib/compare.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-1 (1)
- M tests/test_recalcitrant.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-2 (141)
- M wordgraph/analysers.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-3 (22)
- M wordgraph/grapher.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-4 (30)
- M wordgraph/realiser/realiser.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-5 (22)
- A wordgraph/realiser/templates/en/long/single-point-series.txt https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-6 (1)
- A wordgraph/realiser/templates/en/long/single-point.txt https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-7 (5)
- A wordgraph/realiser/templates/en/short/single-point-series.txt https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-8 (1)
- A wordgraph/realiser/templates/en/short/single-point.txt https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-9 (5)
Patch Links:
- https://github.com/tleeuwenburg/wordgraph/pull/13.patch
- https://github.com/tleeuwenburg/wordgraph/pull/13.diff
— Reply to this email directly or view it on GitHub https://github.com/tleeuwenburg/wordgraph/pull/13.
Tennessee Leeuwenburg http://myownhat.blogspot.com/ "Don't believe everything you think"
No worries, I'll take a look soon. Sorry I took off without saying goodbye. It was great to work with you, and thanks for your direction on the project!
Cheers, Rebecca On 05/08/2014 4:57 PM, "Tennessee Leeuwenburg" notifications@github.com wrote:
Hi Rebecca,
There were a few small conflicts, so I merged this manually. I'm not convinced I totally nailed it, so you might want to just review the master branch at some point to check I got all your changes in. I think I got it mostly right but I did end up marking one of the tests in test_recalcitrant as xfail.
Thanks so much for all your help today.
-T
On Tue, Aug 5, 2014 at 4:36 PM, rebeccad notifications@github.com wrote:
Tests for random/reverse time series restored, and now handles single data
point and no data points gracefully.
You can merge this Pull Request by running
git pull https://github.com/tleeuwenburg/wordgraph fix_xtest_recalcitrant
Or view, comment on, or merge it at:
https://github.com/tleeuwenburg/wordgraph/pull/13 Commit Summary
- tests for random/reverse time series restored, and now handles single data point and no data points gracefully.
File Changes
- M tests/data/server_requests.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-0 (12)
- M tests/lib/compare.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-1 (1)
- M tests/test_recalcitrant.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-2 (141)
- M wordgraph/analysers.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-3 (22)
- M wordgraph/grapher.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-4 (30)
- M wordgraph/realiser/realiser.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-5 (22)
- A wordgraph/realiser/templates/en/long/single-point-series.txt https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-6 (1)
- A wordgraph/realiser/templates/en/long/single-point.txt https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-7 (5)
- A wordgraph/realiser/templates/en/short/single-point-series.txt https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-8 (1)
- A wordgraph/realiser/templates/en/short/single-point.txt https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-9 (5)
Patch Links:
- https://github.com/tleeuwenburg/wordgraph/pull/13.patch
- https://github.com/tleeuwenburg/wordgraph/pull/13.diff
— Reply to this email directly or view it on GitHub https://github.com/tleeuwenburg/wordgraph/pull/13.
Tennessee Leeuwenburg http://myownhat.blogspot.com/ "Don't believe everything you think"
— Reply to this email directly or view it on GitHub https://github.com/tleeuwenburg/wordgraph/pull/13#issuecomment-51157477.
No worries -- it was a lot of fun working with so many people, and I really appreciate the time you put in. Best of luck with whatever you're doing now :)
On Tue, Aug 5, 2014 at 5:00 PM, rebeccad notifications@github.com wrote:
No worries, I'll take a look soon. Sorry I took off without saying goodbye. It was great to work with you, and thanks for your direction on the project!
Cheers, Rebecca On 05/08/2014 4:57 PM, "Tennessee Leeuwenburg" notifications@github.com wrote:
Hi Rebecca,
There were a few small conflicts, so I merged this manually. I'm not convinced I totally nailed it, so you might want to just review the master branch at some point to check I got all your changes in. I think I got it mostly right but I did end up marking one of the tests in test_recalcitrant as xfail.
Thanks so much for all your help today.
-T
On Tue, Aug 5, 2014 at 4:36 PM, rebeccad notifications@github.com wrote:
Tests for random/reverse time series restored, and now handles single data
point and no data points gracefully.
You can merge this Pull Request by running
git pull https://github.com/tleeuwenburg/wordgraph fix_xtest_recalcitrant
Or view, comment on, or merge it at:
https://github.com/tleeuwenburg/wordgraph/pull/13 Commit Summary
- tests for random/reverse time series restored, and now handles single data point and no data points gracefully.
File Changes
- M tests/data/server_requests.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-0 (12)
- M tests/lib/compare.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-1 (1)
- M tests/test_recalcitrant.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-2 (141)
- M wordgraph/analysers.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-3 (22)
- M wordgraph/grapher.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-4 (30)
- M wordgraph/realiser/realiser.py https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-5 (22)
- A wordgraph/realiser/templates/en/long/single-point-series.txt https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-6 (1)
- A wordgraph/realiser/templates/en/long/single-point.txt https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-7 (5)
- A wordgraph/realiser/templates/en/short/single-point-series.txt https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-8 (1)
- A wordgraph/realiser/templates/en/short/single-point.txt https://github.com/tleeuwenburg/wordgraph/pull/13/files#diff-9 (5)
Patch Links:
- https://github.com/tleeuwenburg/wordgraph/pull/13.patch
- https://github.com/tleeuwenburg/wordgraph/pull/13.diff
— Reply to this email directly or view it on GitHub https://github.com/tleeuwenburg/wordgraph/pull/13.
Tennessee Leeuwenburg http://myownhat.blogspot.com/ "Don't believe everything you think"
— Reply to this email directly or view it on GitHub https://github.com/tleeuwenburg/wordgraph/pull/13#issuecomment-51157477.
— Reply to this email directly or view it on GitHub https://github.com/tleeuwenburg/wordgraph/pull/13#issuecomment-51157652.
Tennessee Leeuwenburg http://myownhat.blogspot.com/ "Don't believe everything you think"
Tests for random/reverse time series restored, and now handles single data point and no data points gracefully.