Skip to content

Conversation

@mtbc
Copy link
Member

@mtbc mtbc commented Mar 25, 2013

rebases #904

@snoopycrimecop
Copy link
Member

Conflicting PR. Removed from build OMERO-merge-develop#201. See the console output for more details.

@mtbc
Copy link
Member Author

mtbc commented Mar 26, 2013

I'll wait for #941 to close, then try again.

@mtbc
Copy link
Member Author

mtbc commented Mar 26, 2013

Okay, try including again?

@joshmoore
Copy link
Member

Label removed.

@manics
Copy link
Member

manics commented Mar 27, 2013

Good to merge.

The only remaining files are sphinx/conf.py in the submodules, and files in bioformats/components/xsd-fu

$ cat tmp.sh
#!/bin/sh
if [ ! -s "$1" ]; then
        exit 0
fi

if [ "$(head -n1 $1 |sed -e 's/[[:space:]]*$//')" != '#!/usr/bin/env python' ];
then
        echo "Incorrect #! line: $1"
fi

head -n2 "$1" |grep '^# -\*- coding: utf-8 -\*-' > /dev/null
if [ $? -ne 0 ]; then
        echo "Incorrect coding line: $1"
fi
$ find . -iname \*.py -exec ./tmp.sh {} \; |grep -v ./components/bioformats/components/xsd-fu
Incorrect #! line: ./components/bioformats/docs/sphinx/conf.py
Incorrect #! line: ./docs/sphinx/conf.py

@mtbc
Copy link
Member Author

mtbc commented Mar 27, 2013

Thanks! Hmm, I wonder if there's some generator of Python code that should be tweaked.

@joshmoore
Copy link
Member

conf.py is generated by sphinx, so outside our realm.

joshmoore added a commit that referenced this pull request Mar 27, 2013
Add UTF-8 encoding header to Python scripts. (rebase)
@joshmoore joshmoore merged commit 6ca83b3 into ome:develop Mar 27, 2013
@mtbc mtbc deleted the unicode-python branch March 27, 2013 11:15
@mtbc
Copy link
Member Author

mtbc commented Mar 27, 2013

Is it a one-off generation or does it get regenerated sometimes? If the latter, ome/omero-documentation#303 may be a waste of time.

@joshmoore
Copy link
Member

One-off.

@mtbc
Copy link
Member Author

mtbc commented Mar 27, 2013

Hmm. Maybe we can adopt the ome-documentation one then. (-:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants