Skip to content

Conversation

@sbesson
Copy link
Member

@sbesson sbesson commented Sep 20, 2013

This PR adds a .travis.yml file at the top-level of the repository running flake8 on all the Python scripts. It also fixes individual scripts to comply with flake8 standards and let the Travis build pass.

  • omero/analysis_scripts/Kymograph.py
  • omero/analysis_scripts/Kymograph_Analysis.py
  • omero/analysis_scripts/Plot_Profile.py
  • omero/export_scripts/Batch_Image_Export.py
  • omero/export_scripts/Make_Movie.py
  • omero/figure_scripts/Movie_Figure.py
  • omero/figure_scripts/Movie_ROI_Figure.py
  • omero/figure_scripts/ROI_Split_Figure.py
  • omero/figure_scripts/Split_View_Figure.py
  • omero/figure_scripts/Thumbnail_Figure.py
  • omero/import_scripts/Populate_ROI.py
  • omero/setup_scripts/FLIM_initialise.py
  • omero/util_scripts/Channel_Offsets.py
  • omero/util_scripts/Combine_Images.py
  • omero/util_scripts/Dataset_To_Plate.py
  • omero/util_scripts/Images_From_ROIs.py

To test this PR:

@joshmoore
Copy link
Member

Looking at sbesson@b759912?w=1 is fairly readable. (Note the ?w=1 on the end of that link)

@joshmoore
Copy link
Member

@will-moore, once this PR is accepted, I'll turn on travis for all of ome/scripts and then we'll have testing on every new PR.

@sbesson : don't know if this is important but travis log includes:

Could not locate requirements.txt. Override the install: key in your .travis.yml to install dependencies.

@sbesson
Copy link
Member Author

sbesson commented Sep 23, 2013

@joshmoore: good point. Fixed in the last 2 commits.

@will-moore
Copy link
Member

Running Movie_ROI_Figure.py I get

Traceback (most recent call last):
  File "./script", line 843, in <module>
    runAsScript()
  File "./script", line 832, in runAsScript
    fileAnnotation, message = roiFigure(conn, commandArgs)
  File "./script", line 564, in roiFigure
    imageLabels.append(getLabels(name, tagsList, pdList))
UnboundLocalError: local variable 'getLabels' referenced before assignment

@will-moore
Copy link
Member

Same for Movie_Figure.py

Traceback (most recent call last):
  File "./script", line 672, in <module>
    runAsScript()
  File "./script", line 662, in runAsScript
    fileAnnotation, message = movieFigure(conn, commandArgs)
  File "./script", line 430, in movieFigure
    imageLabels.append(getLabels(name, tagsList, pdList))
UnboundLocalError: local variable 'getLabels' referenced before assignment

@will-moore
Copy link
Member

Having run almost all of the scripts at least once, the only errors I get are the two getLabels ones above, but I also found a problem with unwrapping parameters on Combine_Images.py, which I think is unrelated: Ticket created: https://trac.openmicroscopy.org.uk/ome/ticket/11473

@will-moore
Copy link
Member

OK - working now. Good to merge.

@joshmoore
Copy link
Member

@sbesson: did you want to wait for any rebasing due to the develop PR you mentioned?

@sbesson
Copy link
Member Author

sbesson commented Sep 25, 2013

Up to @will-moore , the PR in question is #31 which needs/could be rebased on dev_4_4.
IN all cases, it only concerns one section of one file so fixing conflicts should be straightforward.

@will-moore
Copy link
Member

I have rebased #31 to #45. Merge in whichever order makes things easiest. I'm happy to fix any conflicts if you want to get this one in first?

@joshmoore
Copy link
Member

@will-moore: 👍 thanks. I'm merging this. Could you rebase and rationalize the rebase with 45? I'll go ahead and activate the travis build for ome/scripts so that we'll see the test status in your rebased PR.

joshmoore added a commit that referenced this pull request Sep 25, 2013
Activate Travis build and fix scripts to comply with flake8 standards
@joshmoore joshmoore merged commit 1a85b96 into ome:dev_4_4 Sep 25, 2013
@sbesson sbesson deleted the travis branch September 25, 2013 09:15
@sbesson
Copy link
Member Author

sbesson commented Sep 25, 2013

--rebased-to #46

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.

3 participants