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

Fix for python3 string type in policy files tickets/DM-8825 #46

Merged
merged 1 commit into from
Jan 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 18 additions & 18 deletions policy/HscMapper.paf
Original file line number Diff line number Diff line change
Expand Up @@ -365,98 +365,98 @@ datasets: {
}
ossThumb: {
template: "%(pointing)05d/%(filter)s/thumbs/oss-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
flattenedThumb: {
template: "%(pointing)05d/%(filter)s/thumbs/flattened-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
calexpThumb: {
template: "%(pointing)05d/%(filter)s/thumbs/corr-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotMagHist: {
template: "%(pointing)05d/%(filter)s/qa/magHist-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotSeeingRough: {
template: "%(pointing)05d/%(filter)s/qa/seeingRough-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotSeeingRobust: {
template: "%(pointing)05d/%(filter)s/qa/seeingRobust-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotSeeingMap: {
template: "%(pointing)05d/%(filter)s/qa/seeingMap-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotEllipseMap: {
template: "%(pointing)05d/%(filter)s/qa/ellipseMap-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotEllipticityMap: {
template: "%(pointing)05d/%(filter)s/qa/ellipticityMap-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotFwhmGrid: {
template: "%(pointing)05d/%(filter)s/qa/fwhmGrid-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotEllipseGrid: {
template: "%(pointing)05d/%(filter)s/qa/ellipseGrid-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotEllipticityGrid: {
template: "%(pointing)05d/%(filter)s/qa/ellipticityGrid-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotPsfSrcGrid: {
template: "%(pointing)05d/%(filter)s/qa/psfSrcGrid-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotPsfModelGrid: {
template: "%(pointing)05d/%(filter)s/qa/psfModelGrid-%(visit)07d-%(ccd)03d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
Expand Down Expand Up @@ -498,22 +498,22 @@ datasets: {
}
tableSeeingMap: {
template: "%(pointing)05d/%(filter)s/qa/seeingMap-%(visit)07d-%(ccd)03d.txt"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
tableSeeingGrid: {
template: "%(pointing)05d/%(filter)s/qa/seeingGrid-%(visit)07d-%(ccd)03d.txt"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
focusPlot: {
template: "%(pointing)05d/%(filter)s/qa/focus-%(visit)07d.png"
# Not really text: we only need the filename, and will write the output ourselves
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
Expand All @@ -537,7 +537,7 @@ datasets: {
focusSweepPlot: {
template: "%(pointing)05d/%(filter)s/qa/focusSweep-%(visit)07d.png"
# Not really text: we only need the filename, and will write the output ourselves
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
Expand Down
32 changes: 16 additions & 16 deletions policy/SuprimecamMapper.paf
Original file line number Diff line number Diff line change
Expand Up @@ -364,98 +364,98 @@ datasets: {
}
ossThumb: {
template: "%(pointing)05d/%(filter)s/thumbs/oss%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
flattenedThumb: {
template: "%(pointing)05d/%(filter)s/thumbs/flattened%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
calexpThumb: {
template: "%(pointing)05d/%(filter)s/thumbs/corr%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotMagHist: {
template: "%(pointing)05d/%(filter)s/qa/magHist%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotSeeingRough: {
template: "%(pointing)05d/%(filter)s/qa/seeingRough%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotSeeingRobust: {
template: "%(pointing)05d/%(filter)s/qa/seeingRobust%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotSeeingMap: {
template: "%(pointing)05d/%(filter)s/qa/seeingMap%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotEllipseMap: {
template: "%(pointing)05d/%(filter)s/qa/ellipseMap%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotEllipticityMap: {
template: "%(pointing)05d/%(filter)s/qa/ellipticityMap%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotFwhmGrid: {
template: "%(pointing)05d/%(filter)s/qa/fwhmGrid%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotEllipseGrid: {
template: "%(pointing)05d/%(filter)s/qa/ellipseGrid%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotEllipticityGrid: {
template: "%(pointing)05d/%(filter)s/qa/ellipticityGrid%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotPsfSrcGrid: {
template: "%(pointing)05d/%(filter)s/qa/psfSrcGrid%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
plotPsfModelGrid: {
template: "%(pointing)05d/%(filter)s/qa/psfModelGrid%(visit)07d%(ccd)d.png"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
Expand Down Expand Up @@ -497,14 +497,14 @@ datasets: {
}
tableSeeingMap: {
template: "%(pointing)05d/%(filter)s/qa/seeingMap%(visit)07d%(ccd)d.txt"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
}
tableSeeingGrid: {
template: "%(pointing)05d/%(filter)s/qa/seeingGrid%(visit)07d%(ccd)d.txt"
python: __builtin__.str
python: builtins.str
persistable: None
storage: TextStorage
tables: raw
Expand Down