Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes issue with '.py' extension in script() functions #104

Merged
merged 10 commits into from May 4, 2017
Merged

Fixes issue with '.py' extension in script() functions #104

merged 10 commits into from May 4, 2017

Conversation

ghost
Copy link

@ghost ghost commented Nov 30, 2016

Closes #103
Fixes script() functions for:

  • boxfill.py
  • meshfill.py
  • isofill.py
  • textcombined.py
  • texttable.py
  • vector.py

Every function had a reference to color which was expected to be float(old color format), except vector, whose .line property had changed to .linetype, which was causing an error.

embrown and others added 4 commits September 21, 2016 08:53
Re-wrote to change ._name and pop old name from elements
if not 'default'. Preserves original objects.
    * boxfill.py
    * meshfill.py
    * isofill.py
    * textcombined.py
    * texttable.py
    * vector.py
Every function had a reference to color which was expected to be
float(old color format), except vector, whose .line property had
changed to .linetype, which was causing an error.
@ghost ghost changed the title Fixes #103 Fixes issue with '.py' extension in script() functions Nov 30, 2016
@aashish24
Copy link
Contributor

thanks @embrown do we have a test for this?

@aashish24
Copy link
Contributor

Looks reasonable to me 👍

@ghost
Copy link
Author

ghost commented Nov 30, 2016

@aashish24 Oh that's right! I forgot to write a test. I'll put one up there.

@aashish24
Copy link
Contributor

LGTM ..

@aashish24
Copy link
Contributor

@embrown do you want to merge this?

@ghost
Copy link
Author

ghost commented Dec 14, 2016

@aashish24 I haven't run the tests on vcs with this in place, so I was waiting for someone more official than myself to do so and make sure I didn't break anything.

@williams13
Copy link
Contributor

williams13 commented Dec 14, 2016 via email

@ghost
Copy link
Author

ghost commented Dec 14, 2016

Thank you @williams13. I would have run the tests myself, but I'm not quite sure what the testing process with VCS is now, since the repo split.

@aashish24
Copy link
Contributor

@embrown @chaosphere2112 or @danlipsa can run the tests (and answer any questions you may have). you can always ping me or @doutriaux1 as well.

@ghost ghost requested review from chaosphere2112 and doutriaux1 December 20, 2016 21:26
@ghost ghost added this to the VCS documentation milestone Dec 20, 2016
Copy link
Contributor

@chaosphere2112 chaosphere2112 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all looks fine; the test needs some work though.

Copy link
Contributor

@chaosphere2112 chaosphere2112 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ran into some issues

Copy link
Contributor

@chaosphere2112 chaosphere2112 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to fix ext_1 and ext_2

@ghost
Copy link
Author

ghost commented Dec 21, 2016

@doutriaux1 @chaosphere2112, I'm finding a lot of bugs in the various script() functions.
I'm in the process of going through and fixing them.
I'll ping you when everything's passing and I submit the PR.

@doutriaux1
Copy link
Contributor

@embrown as far the .scr goes we should deprecate the saving of them if not done already. We should focus on .json ones as far as script goes, and simply reading in OLD scr (as in any recent function would not be in)

@ghost
Copy link
Author

ghost commented Dec 21, 2016

@doutriaux1 Yeah, the SCR deprecation warnings have been in.
I'm going through and addressing errors with how the python files are written out.
It's obviously something not used much, since there don't seem to be any outstanding issues on the fact that the python scripts created don't work. But @chaosphere2112 indicated it is something he needs working, so I'm gonna fix it.

Tested to ensure that scriptrun() on the output scripts creates
objects identical to those on which script() was called.
@ghost
Copy link
Author

ghost commented Dec 21, 2016

@doutriaux1, with a fair bit of help from @chaosphere2112 I was able to get the script() functions working for python files. They produce valid python scripts, and those scripts run correctly with vcs.scriptrun(). I'll push my changes to the test that validates the object created from scriptrun() are identical to those on which script() was called.

@ghost
Copy link
Author

ghost commented Jan 12, 2017

@doutriaux1 @chaosphere2112 , This is done and should be merge-able. Once it's merged, All of the tests I'm adding to the vcs test suite today should work.

@doutriaux1
Copy link
Contributor

@embrown sounds good. I will let @chaosphere2112 some time to review your changes since he requested them. How do you run the documentation test suite again? I would like to add it to travis.yaml eventually.

@ghost
Copy link
Author

ghost commented Jan 12, 2017

@doutriaux1 we're working on building the documentation tests into the vcs test suite, so it should just be run every time the vcs tests are run.

@doutriaux1
Copy link
Contributor

@embrown if you're already doing it then all the merrier for me!

@ghost
Copy link
Author

ghost commented Jan 12, 2017

@doutriaux1 I'm working on it. I've got a PR submitted for the initial test (just tests docstrings from vcs.queries because those all pass without issue), and I'll be adding more tests onto that before I leave today. When I push my final changes to CDAT/cdat#2151, I will add a comment listing which branches need to be merged before all the new tests should (theoretically) pass.
It will probably still need a little work after I leave to get it smoothly integrated into the suite.

@aashish24
Copy link
Contributor

@embrown any update on this branch? Are we just waiting on the review?

@ghost
Copy link
Author

ghost commented Mar 23, 2017

@aashish24 not sure. My internship ended in January, so I think the question would be better directed to @doutriaux1.

@aashish24
Copy link
Contributor

@aashish24 not sure. My internship ended in January, so I think the question would be better directed to @doutriaux1.

thanks @embrown @doutriaux1 could you please review this branch as I am less familiar with this code but I can attempt to review if no one else does.

@doutriaux1 doutriaux1 merged commit f511089 into CDAT:master May 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants