BUG #1944: Rename line to linetype for isoline, unified1d and vector. #2046

danlipsa · 2016-07-06T01:07:25Z

Add separate function to set type, color and width from a line.

danlipsa · 2016-07-06T01:10:16Z

@doutriaux1 @aashish24 Please review. This required more changes than I thought or wanted. Overall I think it is a much clearer API.

sankhesh · 2016-07-18T21:24:12Z

Do: check

kwrobot · 2016-07-18T21:24:18Z

Basic content checks failed!

commit 7442915e adds bad whitespace:
testing/vcs/test_vcs_dump_json.json:13: trailing whitespace.
+   "linetype": "solid", 
testing/vcs/test_vcs_dump_json.json:192: trailing whitespace.
+   ], 
testing/vcs/test_vcs_dump_json.json:228: trailing whitespace.
+   "linetype": null,

Branch-at: 7442915
Rejected-by: @kwrobot

danlipsa · 2016-07-26T11:38:18Z

Do: check

kwrobot · 2016-07-26T11:38:26Z

Basic content checks passed!

Changes since last check: compare

Branch-at: 94c840d
Acked-by: @kwrobot

danlipsa · 2016-07-26T12:10:47Z

@doutriaux1 @aashish24 ping! This also has been setting here for too long.

danlipsa · 2016-07-26T12:45:47Z

Do: test

danlipsa · 2016-07-26T14:34:48Z

@sankhesh @doutriaux1 This test
https://open.cdash.org/testDetails.php?test=462274077&build=4475133
uses
ACTIVATING ENV:2.6
but should be something like:
ACTIVATING ENV:2.6-11-g94c840d
Any idea why?

doutriaux1 · 2016-07-26T14:44:58Z

That is odd indeed did you start with the 2.6 env ?

danlipsa · 2016-07-26T15:24:50Z

@doutriaux1 This is done by buildbot. @sankhesh says that he deletes both the source and the build directory so I am not sure where 2.6 is picked up from.

danlipsa · 2016-07-26T17:21:49Z

Do: test

kwrobot · 2016-07-26T17:21:57Z

Basic content checks failed!

commit 1c404ce3 has committer name "GitHub" with no space.  Run
  git config --global user.name 'Your Name'
  git config --global user.email 'you@yourdomain.com'
before creating commits.

Changes since last check: compare

Branch-at: 1c404ce
Rejected-by: @kwrobot

danlipsa · 2016-07-26T17:23:03Z

Do: test

kwrobot · 2016-07-26T17:23:09Z

Basic content checks passed!

Changes since last check: compare

Branch-at: 7939632
Acked-by: @kwrobot

aashish24 · 2016-07-27T03:39:27Z

testing/vcs/test_vcs_set_line_attribute_from_line.py

@@ -6,16 +6,22 @@
 l.type = "dash"

 v=vcs.createvector()
-v.line = "vcs_test_set_line"
+v.setLineAttributes("vcs_test_set_line")


@danlipsa what does this function do at this point in the code?

@aashish24 Sets linetype, linecolor and linewidth from the line with the name 'vcs_test_set_line'.

danlipsa · 2016-07-27T11:18:57Z

@aashish24 Done.

doutriaux1 · 2016-07-27T13:57:42Z

Packages/vcs/vcs/isoline.py

-        except:
-            pass
-
-    line = property(_getline, _setline)


I don't think we should break backward compatibility, we should probably keep it and raise a deprecated warning.

@doutriaux1 @aashish24 Makes sense. The line interface will still have the bug @chaosphere2112 reported. We won't do any fixes there. Maybe remove it in the next version.

danlipsa · 2016-08-04T12:58:08Z

These are the test failures on Linux:
96% tests passed, 27 tests failed out of 611

Total Test time (real) = 407.44 sec

The following tests FAILED:
13 - testWrite (Failed)
73 - test_vcs_verify_boxfill_basics (Failed)
121 - test_vcs_boxfill_decreasing_latitude (Failed)
122 - test_vcs_meshfill_no_wrapping (Failed)
413 - test_vcs_isofill_level0 (Failed)
414 - test_vcs_isofill_level1 (Failed)
415 - test_vcs_isofill_level2 (Failed)
469 - test_vcs_matplotlib_colormap (Failed)
549 - dv3d_vector_test (Failed)
550 - dv3d_slider_test (Failed)
551 - Hovmoller_volume_test (Failed)
552 - dv3d_volume_test (Failed)
553 - dv3d_constituents_test (Failed)
554 - dv3d_surface_test (Failed)
555 - dv3d_hovmoller_test (Failed)
580 - cdms2_test_createcopy_lose_dtype (Failed)
581 - CDMS_Test_01 (Failed)
582 - CDMS_Test_02 (Failed)
583 - CDMS_Test_03 (Failed)
584 - CDMS_Test_04 (Failed)
590 - CDMS_Test_10 (Failed)
598 - CDMS_Test_18 (Failed)
599 - CDMS_Test_20 (Failed)
602 - CDMS_Test_write_compressed (Failed)
606 - CDMS_Test_pack (Failed)
609 - CDMS_Test_write_extended_dimension (Failed)
610 - CDMS_Test_del_attributes (Failed)

doutriaux1 · 2016-08-04T13:41:46Z

@danlipsa no worries about the failed test, it's due to hdf5 not matching anymore by default under conda. But once I merge the legend PR you will likely need to re-update your baselines.

doutriaux1 · 2016-08-04T13:42:36Z

actually I take it back, this PR does NOT touch the baselines.

danlipsa · 2016-08-04T13:45:25Z

@doutriaux1 Indeed the failed vcs tests are because of hdf5 problem.

danlipsa · 2016-08-04T15:08:11Z

@doutriaux1 @aashish24 Lets get this merged as well, unless you have additional comments/concerns.

doutriaux1 · 2016-08-04T15:43:34Z

@danlipsa I would like to finish/merge fix_travis first if it doesn't take too long.

cdatrobot · 2016-08-04T15:43:47Z

Basic content checks failed!

commit b24b2c9e has committer name "GitHub" with no space.  Run
  git config --global user.name 'Your Name'
  git config --global user.email 'you@yourdomain.com'
before creating commits.
commit e20fded7 adds bad whitespace:
testing/vcs/test_vcs_dump_json.json:13: trailing whitespace.
+   "linetype": "solid", 
testing/vcs/test_vcs_dump_json.json:192: trailing whitespace.
+   ], 
testing/vcs/test_vcs_dump_json.json:228: trailing whitespace.
+   "linetype": null,

Branch-at: b24b2c9
Rejected-by: @llnlbot

danlipsa · 2016-08-04T15:54:34Z

@doutriaux1 Do you worry about conflicts/broken tests?

doutriaux1 · 2016-08-04T15:58:21Z

kind of the opposite, since it shouldn't break anything I would like to see a PR pass on travis ;)

danlipsa · 2016-08-04T18:57:26Z

@doutriaux1 I guess my point was that even if you merge this your PR on travis can go on as before. You should not have any conflicts or any new failing tests. But I can wait if you want to take a closer look at this and you want to finish the travis work first without interruption.

cdatrobot · 2016-08-04T18:57:40Z

Basic content checks failed!

commit e20fded7 adds bad whitespace:
testing/vcs/test_vcs_dump_json.json:13: trailing whitespace.
+   "linetype": "solid", 
testing/vcs/test_vcs_dump_json.json:192: trailing whitespace.
+   ], 
testing/vcs/test_vcs_dump_json.json:228: trailing whitespace.
+   "linetype": null,

Branch-at: b24b2c9
Rejected-by: @llnlbot

Add separate function to set type, color and width from a line.

cdatrobot · 2016-08-05T16:39:10Z

Basic content checks passed!

Changes since last check: compare

Branch-at: b635154
Acked-by: @llnlbot

aashish24 · 2016-08-05T21:08:07Z

@sankhesh I see 4 contents check but no build / test check after the last test command from @danlipsa. What's wrong?

sankhesh · 2016-08-07T17:04:05Z

@aashish24 I was puzzled by it yesterday too. I looked into it. This pull request is older than the changes we made to the bot and I am assuming buildbot is getting confused with the different commands on it. I'll talk to Ben on Monday to see what's wrong exactly.

danlipsa · 2016-08-09T18:17:42Z

@sankhesh It seems that some of the tests still do not activate the right environment:
https://open.cdash.org/testDetails.php?test=462274077&build=4495107

sankhesh · 2016-08-09T19:03:37Z

@danlipsa All the tests on default build are activating the right environment. The tests on the lean build just activate 2.6. I think that is a UV-CDAT issue that needs to be fixed in the code.

danlipsa · 2016-08-09T21:16:54Z

@sankhesh How do you see the default build? I only see the lean build - I click on cdash

sankhesh · 2016-08-10T02:48:55Z

Here is the default build: https://open.cdash.org/buildSummary.php?buildid=4495026

danlipsa · 2016-08-10T16:08:40Z

@sankhesh The test failures look like @doutriaux1 colorbar baselines. I will run the test on my machine to see if they pass.

danlipsa · 2016-08-10T16:45:25Z

@sankhesh On my machine most tests pass - I have 26 failures - most vcs once are from hdf5.
Here are @doutriaux1 baselines.
https://github.com/UV-CDAT/uvcdat-testdata/pull/149/files

In the link you provided, it looks like @doutriaux1 changes are not in, possible because the code uses the wrong conda env? The SHA is correct. The baseline is right but the generated image is wrong. Can you look in the LastTest.log to see the conda env for the tests?

doutriaux1 · 2016-08-10T21:13:53Z

Do: test

cdatrobot · 2016-08-10T21:13:57Z

Testing commands handed to buildbot.

Branch-at: b635154

cdatrobot · 2016-08-10T21:13:58Z

Your merge request has been queued for testing. You may view the test results on CDash or Buildbot.

Branch-at: b635154

…#2046) * BUG #1944: Rename line to linetype for isoline, unified1d and vector. Add separate function to set type, color and width from a line. * Fix test_vcs_read_old_scr_2 - we have one less template

danlipsa force-pushed the linestyle branch from 9fb740e to 7442915 Compare July 6, 2016 01:31

danlipsa force-pushed the linestyle branch from 7442915 to 94c840d Compare July 26, 2016 11:33

danlipsa force-pushed the linestyle branch from 1c404ce to 7939632 Compare July 26, 2016 17:22

aashish24 reviewed Jul 27, 2016
View reviewed changes

danlipsa force-pushed the linestyle branch from 7939632 to 380639c Compare July 27, 2016 11:10

doutriaux1 reviewed Jul 27, 2016
View reviewed changes

danlipsa added 2 commits August 5, 2016 11:58

BUG #1944: Rename line to linetype for isoline, unified1d and vector.

9f0d114

Add separate function to set type, color and width from a line.

Fix test_vcs_read_old_scr_2 - we have one less template

b635154

danlipsa force-pushed the linestyle branch from 7812c86 to b635154 Compare August 5, 2016 15:58

Merge branch 'master' into linestyle

c1eb308

doutriaux1 merged commit 0f3f507 into master Aug 10, 2016

doutriaux1 deleted the linestyle branch August 10, 2016 21:21

BUG #1944: Rename line to linetype for isoline, unified1d and vector. #2046

BUG #1944: Rename line to linetype for isoline, unified1d and vector. #2046

Conversation

danlipsa commented Jul 6, 2016

danlipsa commented Jul 6, 2016

sankhesh commented Jul 18, 2016

kwrobot commented Jul 18, 2016

danlipsa commented Jul 26, 2016

kwrobot commented Jul 26, 2016

danlipsa commented Jul 26, 2016

danlipsa commented Jul 26, 2016

danlipsa commented Jul 26, 2016

doutriaux1 commented Jul 26, 2016

danlipsa commented Jul 26, 2016 • edited

danlipsa commented Jul 26, 2016

kwrobot commented Jul 26, 2016

danlipsa commented Jul 26, 2016

kwrobot commented Jul 26, 2016

aashish24 Jul 27, 2016

Choose a reason for hiding this comment

danlipsa Jul 27, 2016 • edited

Choose a reason for hiding this comment

danlipsa commented Jul 27, 2016

doutriaux1 Jul 27, 2016

Choose a reason for hiding this comment

danlipsa Jul 27, 2016 • edited

Choose a reason for hiding this comment

danlipsa commented Aug 4, 2016 • edited

doutriaux1 commented Aug 4, 2016

doutriaux1 commented Aug 4, 2016

danlipsa commented Aug 4, 2016

danlipsa commented Aug 4, 2016

doutriaux1 commented Aug 4, 2016

cdatrobot commented Aug 4, 2016

danlipsa commented Aug 4, 2016

doutriaux1 commented Aug 4, 2016

danlipsa commented Aug 4, 2016

cdatrobot commented Aug 4, 2016

cdatrobot commented Aug 5, 2016

aashish24 commented Aug 5, 2016

sankhesh commented Aug 7, 2016

danlipsa commented Aug 9, 2016

sankhesh commented Aug 9, 2016

danlipsa commented Aug 9, 2016

sankhesh commented Aug 10, 2016

danlipsa commented Aug 10, 2016

danlipsa commented Aug 10, 2016 • edited

doutriaux1 commented Aug 10, 2016

cdatrobot commented Aug 10, 2016

cdatrobot commented Aug 10, 2016

danlipsa commented Jul 26, 2016 •

edited

danlipsa Jul 27, 2016 •

edited

danlipsa Jul 27, 2016 •

edited

danlipsa commented Aug 4, 2016 •

edited

danlipsa commented Aug 10, 2016 •

edited