From 2897fcf87291c5aa3d955e3c5e8cc7957313299b Mon Sep 17 00:00:00 2001 From: Allen Goodman Date: Mon, 26 Jun 2017 09:53:19 -0400 Subject: [PATCH] use the setuptools.setup package_data parameter --- MANIFEST.in | 2 -- .../data/images}/Align.png | Bin .../data/images}/ApplyThreshold.png | Bin .../images}/BroadPlusImagingPlusBanner.png | Bin .../data/images}/CPCoverPage.png | Bin .../data/images}/CP_logo.png | Bin .../data/images}/CSAIL_Logo.png | Bin .../data/images}/CellProfilerIcon.icns | Bin .../data/images}/CellProfilerIcon.ico | Bin .../data/images}/CellProfilerIcon.png | Bin .../data/images}/CellProfilerIcon_old.png | Bin .../data/images}/CellProfilerSplash.png | Bin .../data/images}/CellProfilersplash.psd | Bin .../data/images}/CollapseTree.png | Bin .../data/images}/ColorToGray.png | Bin .../data/images}/CorrectIlluminationApply.png | Bin .../images}/CorrectIlluminationCalculate.png | Bin .../data/images}/Crop.png | Bin .../data/images}/ExpandOrShrinkObjects.png | Bin .../data/images}/ExpandTree.png | Bin .../data/images}/Gear.png | Bin .../data/images}/GrayToColor.png | Bin .../images}/Groups_ExampleDisplayTable.png | Bin .../data/images}/HorseWhinnying.wav | Bin .../data/images}/IMG_ANALYZE_16.png | Bin .../data/images}/IMG_ANALYZE_24.png | Bin .../data/images}/IMG_CLOSED_EYE.png | Bin .../data/images}/IMG_DISABLED.png | Bin .../data/images}/IMG_ERROR.png | Bin .../data/images}/IMG_EYE.png | Bin .../data/images}/IMG_GO.png | Bin .../data/images}/IMG_IMAGE.png | Bin .../data/images}/IMG_OK.png | Bin .../data/images}/IMG_PAUSE.png | Bin .../data/images}/IMG_RUN.png | Bin .../data/images}/IMG_SLIDER.png | Bin .../data/images}/IMG_SLIDER_ACTIVE.png | Bin .../data/images}/IMG_STOP.png | Bin .../data/images}/IMG_TEST.png | Bin .../data/images}/IMG_UNAVAILABLE.png | Bin .../data/images}/IMG_WARN.png | Bin ...tifyPrimaryObjects_IntensityDeclumping.png | Bin ...IdentifyPrimaryObjects_ShapeDeclumping.png | Bin .../data/images}/IdentifySecondaryObjects.png | Bin .../data/images}/IdentifyTertiaryObjects.png | Bin .../data/images}/Images_FilelistPanel.png | Bin .../images}/Images_FilelistPanel_Blank.png | Bin .../images}/Images_FilelistPanel_Filled.png | Bin .../data/images}/Images_UsingRules.png | Bin .../data/images}/MeasureImageAreaOccupied.png | Bin .../MeasureObjectSizeShape_Eccentricity.png | Bin .../data/images}/MeasureTexture.png | Bin .../images}/Metadata_ExampleDisplayTable.png | Bin .../NamesAndTypes_ExampleDisplayTable.png | Bin .../data/images}/OMERO_imageID_screenshot.png | Bin .../data/images}/OMERO_login_screenshot.png | Bin .../data/images}/Tile.png | Bin .../data/images}/WhiteheadInstituteLogo.png | Bin .../data/images}/check.png | Bin .../data/images}/color.png | Bin .../data/images}/cp_panel_schematic.png | Bin .../data/images}/dapi.png | Bin .../data/images}/delete.png | Bin .../data/images}/downarrow.png | Bin .../data/images}/eye-close.png | Bin .../data/images}/eye-open.png | Bin .../data/images}/ffwd.png | Bin .../data/images}/ffwddisabled.png | Bin .../data/images}/filter.png | Bin .../data/images}/folder_browse.png | Bin .../data/images}/folder_create.png | Bin .../data/images}/folder_refresh.png | Bin {artwork => cellprofiler/data/images}/gfp.png | Bin .../data/images}/icon_copyrights.txt | 0 .../data/images}/illumination_function.png | Bin .../data/images}/image_to_object_dataflow.png | Bin .../data/images}/image_to_object_dataflow.psd | Bin .../data/images}/logo.png | Bin .../data/images}/mask.png | Bin .../data/images}/microscope-color_16.png | Bin .../data/images}/microscope-icon_16.png | Bin .../data/images}/microscope-icon_32.png | Bin .../data/images}/microscopes_16.png | Bin .../data/images}/module_add.png | Bin .../data/images}/module_help.png | Bin .../data/images}/module_movedown.png | Bin .../data/images}/module_moveup.png | Bin .../data/images}/module_remove.png | Bin .../data/images}/monochrome.png | Bin .../data/images}/movie_16.png | Bin .../data/images}/next.png | Bin .../data/images}/objects.png | Bin .../data/images}/pause.png | Bin .../data/images}/pausedisabled.png | Bin .../data/images}/play.png | Bin .../data/images}/playdisabled.png | Bin .../data/images}/previous.png | Bin .../data/images}/remove-sign.png | Bin .../data/images}/rewind.png | Bin .../data/images}/rewinddisabled.png | Bin .../data/images}/status_pause.png | Bin .../data/images}/status_save.png | Bin .../data/images}/status_stop.png | Bin .../data/images}/stop.png | Bin .../data/images}/stopdisabled.png | Bin .../data/images}/thumb-down.png | Bin .../data/images}/thumb-up.png | Bin .../data/images}/unchecked.png | Bin .../data/images}/welcome_screen_help.png | Bin .../data/images}/welcomescreen_forum.png | Bin .../data/images}/welcomescreen_manual.png | Bin .../data/images}/welcomescreen_tutorials.png | Bin .../data/images}/window_back.png | Bin .../data/images}/window_filesave.png | Bin .../data/images}/window_forward.png | Bin .../data/images}/window_home.png | Bin .../data/images}/window_pan.png | Bin .../data/images}/window_zoom_to_rect.png | Bin cellprofiler/gui/pipelinecontroller.py | 2 +- cellprofiler/icons/__init__.py | 16 ++++++++-------- cellprofiler/worker.py | 2 +- setup.cfg | 4 ++-- setup.py | 18 ++++++++++-------- tests/modules/__init__.py | 3 ++- 124 files changed, 24 insertions(+), 23 deletions(-) rename {artwork => cellprofiler/data/images}/Align.png (100%) rename {artwork => cellprofiler/data/images}/ApplyThreshold.png (100%) rename {artwork => cellprofiler/data/images}/BroadPlusImagingPlusBanner.png (100%) rename {artwork => cellprofiler/data/images}/CPCoverPage.png (100%) rename {artwork => cellprofiler/data/images}/CP_logo.png (100%) rename {artwork => cellprofiler/data/images}/CSAIL_Logo.png (100%) rename {artwork => cellprofiler/data/images}/CellProfilerIcon.icns (100%) rename {artwork => cellprofiler/data/images}/CellProfilerIcon.ico (100%) rename {artwork => cellprofiler/data/images}/CellProfilerIcon.png (100%) rename {artwork => cellprofiler/data/images}/CellProfilerIcon_old.png (100%) rename {artwork => cellprofiler/data/images}/CellProfilerSplash.png (100%) rename {artwork => cellprofiler/data/images}/CellProfilersplash.psd (100%) rename {artwork => cellprofiler/data/images}/CollapseTree.png (100%) rename {artwork => cellprofiler/data/images}/ColorToGray.png (100%) rename {artwork => cellprofiler/data/images}/CorrectIlluminationApply.png (100%) rename {artwork => cellprofiler/data/images}/CorrectIlluminationCalculate.png (100%) rename {artwork => cellprofiler/data/images}/Crop.png (100%) rename {artwork => cellprofiler/data/images}/ExpandOrShrinkObjects.png (100%) rename {artwork => cellprofiler/data/images}/ExpandTree.png (100%) rename {artwork => cellprofiler/data/images}/Gear.png (100%) rename {artwork => cellprofiler/data/images}/GrayToColor.png (100%) rename {artwork => cellprofiler/data/images}/Groups_ExampleDisplayTable.png (100%) rename {artwork => cellprofiler/data/images}/HorseWhinnying.wav (100%) rename {artwork => cellprofiler/data/images}/IMG_ANALYZE_16.png (100%) rename {artwork => cellprofiler/data/images}/IMG_ANALYZE_24.png (100%) rename {artwork => cellprofiler/data/images}/IMG_CLOSED_EYE.png (100%) rename {artwork => cellprofiler/data/images}/IMG_DISABLED.png (100%) rename {artwork => cellprofiler/data/images}/IMG_ERROR.png (100%) rename {artwork => cellprofiler/data/images}/IMG_EYE.png (100%) rename {artwork => cellprofiler/data/images}/IMG_GO.png (100%) rename {artwork => cellprofiler/data/images}/IMG_IMAGE.png (100%) rename {artwork => cellprofiler/data/images}/IMG_OK.png (100%) rename {artwork => cellprofiler/data/images}/IMG_PAUSE.png (100%) rename {artwork => cellprofiler/data/images}/IMG_RUN.png (100%) rename {artwork => cellprofiler/data/images}/IMG_SLIDER.png (100%) rename {artwork => cellprofiler/data/images}/IMG_SLIDER_ACTIVE.png (100%) rename {artwork => cellprofiler/data/images}/IMG_STOP.png (100%) rename {artwork => cellprofiler/data/images}/IMG_TEST.png (100%) rename {artwork => cellprofiler/data/images}/IMG_UNAVAILABLE.png (100%) rename {artwork => cellprofiler/data/images}/IMG_WARN.png (100%) rename {artwork => cellprofiler/data/images}/IdentifyPrimaryObjects_IntensityDeclumping.png (100%) rename {artwork => cellprofiler/data/images}/IdentifyPrimaryObjects_ShapeDeclumping.png (100%) rename {artwork => cellprofiler/data/images}/IdentifySecondaryObjects.png (100%) rename {artwork => cellprofiler/data/images}/IdentifyTertiaryObjects.png (100%) rename {artwork => cellprofiler/data/images}/Images_FilelistPanel.png (100%) rename {artwork => cellprofiler/data/images}/Images_FilelistPanel_Blank.png (100%) rename {artwork => cellprofiler/data/images}/Images_FilelistPanel_Filled.png (100%) rename {artwork => cellprofiler/data/images}/Images_UsingRules.png (100%) rename {artwork => cellprofiler/data/images}/MeasureImageAreaOccupied.png (100%) rename {artwork => cellprofiler/data/images}/MeasureObjectSizeShape_Eccentricity.png (100%) rename {artwork => cellprofiler/data/images}/MeasureTexture.png (100%) rename {artwork => cellprofiler/data/images}/Metadata_ExampleDisplayTable.png (100%) rename {artwork => cellprofiler/data/images}/NamesAndTypes_ExampleDisplayTable.png (100%) rename {artwork => cellprofiler/data/images}/OMERO_imageID_screenshot.png (100%) rename {artwork => cellprofiler/data/images}/OMERO_login_screenshot.png (100%) rename {artwork => cellprofiler/data/images}/Tile.png (100%) rename {artwork => cellprofiler/data/images}/WhiteheadInstituteLogo.png (100%) rename {artwork => cellprofiler/data/images}/check.png (100%) rename {artwork => cellprofiler/data/images}/color.png (100%) rename {artwork => cellprofiler/data/images}/cp_panel_schematic.png (100%) rename {artwork => cellprofiler/data/images}/dapi.png (100%) rename {artwork => cellprofiler/data/images}/delete.png (100%) rename {artwork => cellprofiler/data/images}/downarrow.png (100%) rename {artwork => cellprofiler/data/images}/eye-close.png (100%) rename {artwork => cellprofiler/data/images}/eye-open.png (100%) rename {artwork => cellprofiler/data/images}/ffwd.png (100%) rename {artwork => cellprofiler/data/images}/ffwddisabled.png (100%) rename {artwork => cellprofiler/data/images}/filter.png (100%) rename {artwork => cellprofiler/data/images}/folder_browse.png (100%) rename {artwork => cellprofiler/data/images}/folder_create.png (100%) rename {artwork => cellprofiler/data/images}/folder_refresh.png (100%) rename {artwork => cellprofiler/data/images}/gfp.png (100%) rename {artwork => cellprofiler/data/images}/icon_copyrights.txt (100%) rename {artwork => cellprofiler/data/images}/illumination_function.png (100%) rename {artwork => cellprofiler/data/images}/image_to_object_dataflow.png (100%) rename {artwork => cellprofiler/data/images}/image_to_object_dataflow.psd (100%) rename {artwork => cellprofiler/data/images}/logo.png (100%) rename {artwork => cellprofiler/data/images}/mask.png (100%) rename {artwork => cellprofiler/data/images}/microscope-color_16.png (100%) rename {artwork => cellprofiler/data/images}/microscope-icon_16.png (100%) rename {artwork => cellprofiler/data/images}/microscope-icon_32.png (100%) rename {artwork => cellprofiler/data/images}/microscopes_16.png (100%) rename {artwork => cellprofiler/data/images}/module_add.png (100%) rename {artwork => cellprofiler/data/images}/module_help.png (100%) rename {artwork => cellprofiler/data/images}/module_movedown.png (100%) rename {artwork => cellprofiler/data/images}/module_moveup.png (100%) rename {artwork => cellprofiler/data/images}/module_remove.png (100%) rename {artwork => cellprofiler/data/images}/monochrome.png (100%) rename {artwork => cellprofiler/data/images}/movie_16.png (100%) rename {artwork => cellprofiler/data/images}/next.png (100%) rename {artwork => cellprofiler/data/images}/objects.png (100%) rename {artwork => cellprofiler/data/images}/pause.png (100%) rename {artwork => cellprofiler/data/images}/pausedisabled.png (100%) rename {artwork => cellprofiler/data/images}/play.png (100%) rename {artwork => cellprofiler/data/images}/playdisabled.png (100%) rename {artwork => cellprofiler/data/images}/previous.png (100%) rename {artwork => cellprofiler/data/images}/remove-sign.png (100%) rename {artwork => cellprofiler/data/images}/rewind.png (100%) rename {artwork => cellprofiler/data/images}/rewinddisabled.png (100%) rename {artwork => cellprofiler/data/images}/status_pause.png (100%) rename {artwork => cellprofiler/data/images}/status_save.png (100%) rename {artwork => cellprofiler/data/images}/status_stop.png (100%) rename {artwork => cellprofiler/data/images}/stop.png (100%) rename {artwork => cellprofiler/data/images}/stopdisabled.png (100%) rename {artwork => cellprofiler/data/images}/thumb-down.png (100%) rename {artwork => cellprofiler/data/images}/thumb-up.png (100%) rename {artwork => cellprofiler/data/images}/unchecked.png (100%) rename {artwork => cellprofiler/data/images}/welcome_screen_help.png (100%) rename {artwork => cellprofiler/data/images}/welcomescreen_forum.png (100%) rename {artwork => cellprofiler/data/images}/welcomescreen_manual.png (100%) rename {artwork => cellprofiler/data/images}/welcomescreen_tutorials.png (100%) rename {artwork => cellprofiler/data/images}/window_back.png (100%) rename {artwork => cellprofiler/data/images}/window_filesave.png (100%) rename {artwork => cellprofiler/data/images}/window_forward.png (100%) rename {artwork => cellprofiler/data/images}/window_home.png (100%) rename {artwork => cellprofiler/data/images}/window_pan.png (100%) rename {artwork => cellprofiler/data/images}/window_zoom_to_rect.png (100%) diff --git a/MANIFEST.in b/MANIFEST.in index aef6a54a60..1aba38f67a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1 @@ include LICENSE - -recursive-include artwork * diff --git a/artwork/Align.png b/cellprofiler/data/images/Align.png similarity index 100% rename from artwork/Align.png rename to cellprofiler/data/images/Align.png diff --git a/artwork/ApplyThreshold.png b/cellprofiler/data/images/ApplyThreshold.png similarity index 100% rename from artwork/ApplyThreshold.png rename to cellprofiler/data/images/ApplyThreshold.png diff --git a/artwork/BroadPlusImagingPlusBanner.png b/cellprofiler/data/images/BroadPlusImagingPlusBanner.png similarity index 100% rename from artwork/BroadPlusImagingPlusBanner.png rename to cellprofiler/data/images/BroadPlusImagingPlusBanner.png diff --git a/artwork/CPCoverPage.png b/cellprofiler/data/images/CPCoverPage.png similarity index 100% rename from artwork/CPCoverPage.png rename to cellprofiler/data/images/CPCoverPage.png diff --git a/artwork/CP_logo.png b/cellprofiler/data/images/CP_logo.png similarity index 100% rename from artwork/CP_logo.png rename to cellprofiler/data/images/CP_logo.png diff --git a/artwork/CSAIL_Logo.png b/cellprofiler/data/images/CSAIL_Logo.png similarity index 100% rename from artwork/CSAIL_Logo.png rename to cellprofiler/data/images/CSAIL_Logo.png diff --git a/artwork/CellProfilerIcon.icns b/cellprofiler/data/images/CellProfilerIcon.icns similarity index 100% rename from artwork/CellProfilerIcon.icns rename to cellprofiler/data/images/CellProfilerIcon.icns diff --git a/artwork/CellProfilerIcon.ico b/cellprofiler/data/images/CellProfilerIcon.ico similarity index 100% rename from artwork/CellProfilerIcon.ico rename to cellprofiler/data/images/CellProfilerIcon.ico diff --git a/artwork/CellProfilerIcon.png b/cellprofiler/data/images/CellProfilerIcon.png similarity index 100% rename from artwork/CellProfilerIcon.png rename to cellprofiler/data/images/CellProfilerIcon.png diff --git a/artwork/CellProfilerIcon_old.png b/cellprofiler/data/images/CellProfilerIcon_old.png similarity index 100% rename from artwork/CellProfilerIcon_old.png rename to cellprofiler/data/images/CellProfilerIcon_old.png diff --git a/artwork/CellProfilerSplash.png b/cellprofiler/data/images/CellProfilerSplash.png similarity index 100% rename from artwork/CellProfilerSplash.png rename to cellprofiler/data/images/CellProfilerSplash.png diff --git a/artwork/CellProfilersplash.psd b/cellprofiler/data/images/CellProfilersplash.psd similarity index 100% rename from artwork/CellProfilersplash.psd rename to cellprofiler/data/images/CellProfilersplash.psd diff --git a/artwork/CollapseTree.png b/cellprofiler/data/images/CollapseTree.png similarity index 100% rename from artwork/CollapseTree.png rename to cellprofiler/data/images/CollapseTree.png diff --git a/artwork/ColorToGray.png b/cellprofiler/data/images/ColorToGray.png similarity index 100% rename from artwork/ColorToGray.png rename to cellprofiler/data/images/ColorToGray.png diff --git a/artwork/CorrectIlluminationApply.png b/cellprofiler/data/images/CorrectIlluminationApply.png similarity index 100% rename from artwork/CorrectIlluminationApply.png rename to cellprofiler/data/images/CorrectIlluminationApply.png diff --git a/artwork/CorrectIlluminationCalculate.png b/cellprofiler/data/images/CorrectIlluminationCalculate.png similarity index 100% rename from artwork/CorrectIlluminationCalculate.png rename to cellprofiler/data/images/CorrectIlluminationCalculate.png diff --git a/artwork/Crop.png b/cellprofiler/data/images/Crop.png similarity index 100% rename from artwork/Crop.png rename to cellprofiler/data/images/Crop.png diff --git a/artwork/ExpandOrShrinkObjects.png b/cellprofiler/data/images/ExpandOrShrinkObjects.png similarity index 100% rename from artwork/ExpandOrShrinkObjects.png rename to cellprofiler/data/images/ExpandOrShrinkObjects.png diff --git a/artwork/ExpandTree.png b/cellprofiler/data/images/ExpandTree.png similarity index 100% rename from artwork/ExpandTree.png rename to cellprofiler/data/images/ExpandTree.png diff --git a/artwork/Gear.png b/cellprofiler/data/images/Gear.png similarity index 100% rename from artwork/Gear.png rename to cellprofiler/data/images/Gear.png diff --git a/artwork/GrayToColor.png b/cellprofiler/data/images/GrayToColor.png similarity index 100% rename from artwork/GrayToColor.png rename to cellprofiler/data/images/GrayToColor.png diff --git a/artwork/Groups_ExampleDisplayTable.png b/cellprofiler/data/images/Groups_ExampleDisplayTable.png similarity index 100% rename from artwork/Groups_ExampleDisplayTable.png rename to cellprofiler/data/images/Groups_ExampleDisplayTable.png diff --git a/artwork/HorseWhinnying.wav b/cellprofiler/data/images/HorseWhinnying.wav similarity index 100% rename from artwork/HorseWhinnying.wav rename to cellprofiler/data/images/HorseWhinnying.wav diff --git a/artwork/IMG_ANALYZE_16.png b/cellprofiler/data/images/IMG_ANALYZE_16.png similarity index 100% rename from artwork/IMG_ANALYZE_16.png rename to cellprofiler/data/images/IMG_ANALYZE_16.png diff --git a/artwork/IMG_ANALYZE_24.png b/cellprofiler/data/images/IMG_ANALYZE_24.png similarity index 100% rename from artwork/IMG_ANALYZE_24.png rename to cellprofiler/data/images/IMG_ANALYZE_24.png diff --git a/artwork/IMG_CLOSED_EYE.png b/cellprofiler/data/images/IMG_CLOSED_EYE.png similarity index 100% rename from artwork/IMG_CLOSED_EYE.png rename to cellprofiler/data/images/IMG_CLOSED_EYE.png diff --git a/artwork/IMG_DISABLED.png b/cellprofiler/data/images/IMG_DISABLED.png similarity index 100% rename from artwork/IMG_DISABLED.png rename to cellprofiler/data/images/IMG_DISABLED.png diff --git a/artwork/IMG_ERROR.png b/cellprofiler/data/images/IMG_ERROR.png similarity index 100% rename from artwork/IMG_ERROR.png rename to cellprofiler/data/images/IMG_ERROR.png diff --git a/artwork/IMG_EYE.png b/cellprofiler/data/images/IMG_EYE.png similarity index 100% rename from artwork/IMG_EYE.png rename to cellprofiler/data/images/IMG_EYE.png diff --git a/artwork/IMG_GO.png b/cellprofiler/data/images/IMG_GO.png similarity index 100% rename from artwork/IMG_GO.png rename to cellprofiler/data/images/IMG_GO.png diff --git a/artwork/IMG_IMAGE.png b/cellprofiler/data/images/IMG_IMAGE.png similarity index 100% rename from artwork/IMG_IMAGE.png rename to cellprofiler/data/images/IMG_IMAGE.png diff --git a/artwork/IMG_OK.png b/cellprofiler/data/images/IMG_OK.png similarity index 100% rename from artwork/IMG_OK.png rename to cellprofiler/data/images/IMG_OK.png diff --git a/artwork/IMG_PAUSE.png b/cellprofiler/data/images/IMG_PAUSE.png similarity index 100% rename from artwork/IMG_PAUSE.png rename to cellprofiler/data/images/IMG_PAUSE.png diff --git a/artwork/IMG_RUN.png b/cellprofiler/data/images/IMG_RUN.png similarity index 100% rename from artwork/IMG_RUN.png rename to cellprofiler/data/images/IMG_RUN.png diff --git a/artwork/IMG_SLIDER.png b/cellprofiler/data/images/IMG_SLIDER.png similarity index 100% rename from artwork/IMG_SLIDER.png rename to cellprofiler/data/images/IMG_SLIDER.png diff --git a/artwork/IMG_SLIDER_ACTIVE.png b/cellprofiler/data/images/IMG_SLIDER_ACTIVE.png similarity index 100% rename from artwork/IMG_SLIDER_ACTIVE.png rename to cellprofiler/data/images/IMG_SLIDER_ACTIVE.png diff --git a/artwork/IMG_STOP.png b/cellprofiler/data/images/IMG_STOP.png similarity index 100% rename from artwork/IMG_STOP.png rename to cellprofiler/data/images/IMG_STOP.png diff --git a/artwork/IMG_TEST.png b/cellprofiler/data/images/IMG_TEST.png similarity index 100% rename from artwork/IMG_TEST.png rename to cellprofiler/data/images/IMG_TEST.png diff --git a/artwork/IMG_UNAVAILABLE.png b/cellprofiler/data/images/IMG_UNAVAILABLE.png similarity index 100% rename from artwork/IMG_UNAVAILABLE.png rename to cellprofiler/data/images/IMG_UNAVAILABLE.png diff --git a/artwork/IMG_WARN.png b/cellprofiler/data/images/IMG_WARN.png similarity index 100% rename from artwork/IMG_WARN.png rename to cellprofiler/data/images/IMG_WARN.png diff --git a/artwork/IdentifyPrimaryObjects_IntensityDeclumping.png b/cellprofiler/data/images/IdentifyPrimaryObjects_IntensityDeclumping.png similarity index 100% rename from artwork/IdentifyPrimaryObjects_IntensityDeclumping.png rename to cellprofiler/data/images/IdentifyPrimaryObjects_IntensityDeclumping.png diff --git a/artwork/IdentifyPrimaryObjects_ShapeDeclumping.png b/cellprofiler/data/images/IdentifyPrimaryObjects_ShapeDeclumping.png similarity index 100% rename from artwork/IdentifyPrimaryObjects_ShapeDeclumping.png rename to cellprofiler/data/images/IdentifyPrimaryObjects_ShapeDeclumping.png diff --git a/artwork/IdentifySecondaryObjects.png b/cellprofiler/data/images/IdentifySecondaryObjects.png similarity index 100% rename from artwork/IdentifySecondaryObjects.png rename to cellprofiler/data/images/IdentifySecondaryObjects.png diff --git a/artwork/IdentifyTertiaryObjects.png b/cellprofiler/data/images/IdentifyTertiaryObjects.png similarity index 100% rename from artwork/IdentifyTertiaryObjects.png rename to cellprofiler/data/images/IdentifyTertiaryObjects.png diff --git a/artwork/Images_FilelistPanel.png b/cellprofiler/data/images/Images_FilelistPanel.png similarity index 100% rename from artwork/Images_FilelistPanel.png rename to cellprofiler/data/images/Images_FilelistPanel.png diff --git a/artwork/Images_FilelistPanel_Blank.png b/cellprofiler/data/images/Images_FilelistPanel_Blank.png similarity index 100% rename from artwork/Images_FilelistPanel_Blank.png rename to cellprofiler/data/images/Images_FilelistPanel_Blank.png diff --git a/artwork/Images_FilelistPanel_Filled.png b/cellprofiler/data/images/Images_FilelistPanel_Filled.png similarity index 100% rename from artwork/Images_FilelistPanel_Filled.png rename to cellprofiler/data/images/Images_FilelistPanel_Filled.png diff --git a/artwork/Images_UsingRules.png b/cellprofiler/data/images/Images_UsingRules.png similarity index 100% rename from artwork/Images_UsingRules.png rename to cellprofiler/data/images/Images_UsingRules.png diff --git a/artwork/MeasureImageAreaOccupied.png b/cellprofiler/data/images/MeasureImageAreaOccupied.png similarity index 100% rename from artwork/MeasureImageAreaOccupied.png rename to cellprofiler/data/images/MeasureImageAreaOccupied.png diff --git a/artwork/MeasureObjectSizeShape_Eccentricity.png b/cellprofiler/data/images/MeasureObjectSizeShape_Eccentricity.png similarity index 100% rename from artwork/MeasureObjectSizeShape_Eccentricity.png rename to cellprofiler/data/images/MeasureObjectSizeShape_Eccentricity.png diff --git a/artwork/MeasureTexture.png b/cellprofiler/data/images/MeasureTexture.png similarity index 100% rename from artwork/MeasureTexture.png rename to cellprofiler/data/images/MeasureTexture.png diff --git a/artwork/Metadata_ExampleDisplayTable.png b/cellprofiler/data/images/Metadata_ExampleDisplayTable.png similarity index 100% rename from artwork/Metadata_ExampleDisplayTable.png rename to cellprofiler/data/images/Metadata_ExampleDisplayTable.png diff --git a/artwork/NamesAndTypes_ExampleDisplayTable.png b/cellprofiler/data/images/NamesAndTypes_ExampleDisplayTable.png similarity index 100% rename from artwork/NamesAndTypes_ExampleDisplayTable.png rename to cellprofiler/data/images/NamesAndTypes_ExampleDisplayTable.png diff --git a/artwork/OMERO_imageID_screenshot.png b/cellprofiler/data/images/OMERO_imageID_screenshot.png similarity index 100% rename from artwork/OMERO_imageID_screenshot.png rename to cellprofiler/data/images/OMERO_imageID_screenshot.png diff --git a/artwork/OMERO_login_screenshot.png b/cellprofiler/data/images/OMERO_login_screenshot.png similarity index 100% rename from artwork/OMERO_login_screenshot.png rename to cellprofiler/data/images/OMERO_login_screenshot.png diff --git a/artwork/Tile.png b/cellprofiler/data/images/Tile.png similarity index 100% rename from artwork/Tile.png rename to cellprofiler/data/images/Tile.png diff --git a/artwork/WhiteheadInstituteLogo.png b/cellprofiler/data/images/WhiteheadInstituteLogo.png similarity index 100% rename from artwork/WhiteheadInstituteLogo.png rename to cellprofiler/data/images/WhiteheadInstituteLogo.png diff --git a/artwork/check.png b/cellprofiler/data/images/check.png similarity index 100% rename from artwork/check.png rename to cellprofiler/data/images/check.png diff --git a/artwork/color.png b/cellprofiler/data/images/color.png similarity index 100% rename from artwork/color.png rename to cellprofiler/data/images/color.png diff --git a/artwork/cp_panel_schematic.png b/cellprofiler/data/images/cp_panel_schematic.png similarity index 100% rename from artwork/cp_panel_schematic.png rename to cellprofiler/data/images/cp_panel_schematic.png diff --git a/artwork/dapi.png b/cellprofiler/data/images/dapi.png similarity index 100% rename from artwork/dapi.png rename to cellprofiler/data/images/dapi.png diff --git a/artwork/delete.png b/cellprofiler/data/images/delete.png similarity index 100% rename from artwork/delete.png rename to cellprofiler/data/images/delete.png diff --git a/artwork/downarrow.png b/cellprofiler/data/images/downarrow.png similarity index 100% rename from artwork/downarrow.png rename to cellprofiler/data/images/downarrow.png diff --git a/artwork/eye-close.png b/cellprofiler/data/images/eye-close.png similarity index 100% rename from artwork/eye-close.png rename to cellprofiler/data/images/eye-close.png diff --git a/artwork/eye-open.png b/cellprofiler/data/images/eye-open.png similarity index 100% rename from artwork/eye-open.png rename to cellprofiler/data/images/eye-open.png diff --git a/artwork/ffwd.png b/cellprofiler/data/images/ffwd.png similarity index 100% rename from artwork/ffwd.png rename to cellprofiler/data/images/ffwd.png diff --git a/artwork/ffwddisabled.png b/cellprofiler/data/images/ffwddisabled.png similarity index 100% rename from artwork/ffwddisabled.png rename to cellprofiler/data/images/ffwddisabled.png diff --git a/artwork/filter.png b/cellprofiler/data/images/filter.png similarity index 100% rename from artwork/filter.png rename to cellprofiler/data/images/filter.png diff --git a/artwork/folder_browse.png b/cellprofiler/data/images/folder_browse.png similarity index 100% rename from artwork/folder_browse.png rename to cellprofiler/data/images/folder_browse.png diff --git a/artwork/folder_create.png b/cellprofiler/data/images/folder_create.png similarity index 100% rename from artwork/folder_create.png rename to cellprofiler/data/images/folder_create.png diff --git a/artwork/folder_refresh.png b/cellprofiler/data/images/folder_refresh.png similarity index 100% rename from artwork/folder_refresh.png rename to cellprofiler/data/images/folder_refresh.png diff --git a/artwork/gfp.png b/cellprofiler/data/images/gfp.png similarity index 100% rename from artwork/gfp.png rename to cellprofiler/data/images/gfp.png diff --git a/artwork/icon_copyrights.txt b/cellprofiler/data/images/icon_copyrights.txt similarity index 100% rename from artwork/icon_copyrights.txt rename to cellprofiler/data/images/icon_copyrights.txt diff --git a/artwork/illumination_function.png b/cellprofiler/data/images/illumination_function.png similarity index 100% rename from artwork/illumination_function.png rename to cellprofiler/data/images/illumination_function.png diff --git a/artwork/image_to_object_dataflow.png b/cellprofiler/data/images/image_to_object_dataflow.png similarity index 100% rename from artwork/image_to_object_dataflow.png rename to cellprofiler/data/images/image_to_object_dataflow.png diff --git a/artwork/image_to_object_dataflow.psd b/cellprofiler/data/images/image_to_object_dataflow.psd similarity index 100% rename from artwork/image_to_object_dataflow.psd rename to cellprofiler/data/images/image_to_object_dataflow.psd diff --git a/artwork/logo.png b/cellprofiler/data/images/logo.png similarity index 100% rename from artwork/logo.png rename to cellprofiler/data/images/logo.png diff --git a/artwork/mask.png b/cellprofiler/data/images/mask.png similarity index 100% rename from artwork/mask.png rename to cellprofiler/data/images/mask.png diff --git a/artwork/microscope-color_16.png b/cellprofiler/data/images/microscope-color_16.png similarity index 100% rename from artwork/microscope-color_16.png rename to cellprofiler/data/images/microscope-color_16.png diff --git a/artwork/microscope-icon_16.png b/cellprofiler/data/images/microscope-icon_16.png similarity index 100% rename from artwork/microscope-icon_16.png rename to cellprofiler/data/images/microscope-icon_16.png diff --git a/artwork/microscope-icon_32.png b/cellprofiler/data/images/microscope-icon_32.png similarity index 100% rename from artwork/microscope-icon_32.png rename to cellprofiler/data/images/microscope-icon_32.png diff --git a/artwork/microscopes_16.png b/cellprofiler/data/images/microscopes_16.png similarity index 100% rename from artwork/microscopes_16.png rename to cellprofiler/data/images/microscopes_16.png diff --git a/artwork/module_add.png b/cellprofiler/data/images/module_add.png similarity index 100% rename from artwork/module_add.png rename to cellprofiler/data/images/module_add.png diff --git a/artwork/module_help.png b/cellprofiler/data/images/module_help.png similarity index 100% rename from artwork/module_help.png rename to cellprofiler/data/images/module_help.png diff --git a/artwork/module_movedown.png b/cellprofiler/data/images/module_movedown.png similarity index 100% rename from artwork/module_movedown.png rename to cellprofiler/data/images/module_movedown.png diff --git a/artwork/module_moveup.png b/cellprofiler/data/images/module_moveup.png similarity index 100% rename from artwork/module_moveup.png rename to cellprofiler/data/images/module_moveup.png diff --git a/artwork/module_remove.png b/cellprofiler/data/images/module_remove.png similarity index 100% rename from artwork/module_remove.png rename to cellprofiler/data/images/module_remove.png diff --git a/artwork/monochrome.png b/cellprofiler/data/images/monochrome.png similarity index 100% rename from artwork/monochrome.png rename to cellprofiler/data/images/monochrome.png diff --git a/artwork/movie_16.png b/cellprofiler/data/images/movie_16.png similarity index 100% rename from artwork/movie_16.png rename to cellprofiler/data/images/movie_16.png diff --git a/artwork/next.png b/cellprofiler/data/images/next.png similarity index 100% rename from artwork/next.png rename to cellprofiler/data/images/next.png diff --git a/artwork/objects.png b/cellprofiler/data/images/objects.png similarity index 100% rename from artwork/objects.png rename to cellprofiler/data/images/objects.png diff --git a/artwork/pause.png b/cellprofiler/data/images/pause.png similarity index 100% rename from artwork/pause.png rename to cellprofiler/data/images/pause.png diff --git a/artwork/pausedisabled.png b/cellprofiler/data/images/pausedisabled.png similarity index 100% rename from artwork/pausedisabled.png rename to cellprofiler/data/images/pausedisabled.png diff --git a/artwork/play.png b/cellprofiler/data/images/play.png similarity index 100% rename from artwork/play.png rename to cellprofiler/data/images/play.png diff --git a/artwork/playdisabled.png b/cellprofiler/data/images/playdisabled.png similarity index 100% rename from artwork/playdisabled.png rename to cellprofiler/data/images/playdisabled.png diff --git a/artwork/previous.png b/cellprofiler/data/images/previous.png similarity index 100% rename from artwork/previous.png rename to cellprofiler/data/images/previous.png diff --git a/artwork/remove-sign.png b/cellprofiler/data/images/remove-sign.png similarity index 100% rename from artwork/remove-sign.png rename to cellprofiler/data/images/remove-sign.png diff --git a/artwork/rewind.png b/cellprofiler/data/images/rewind.png similarity index 100% rename from artwork/rewind.png rename to cellprofiler/data/images/rewind.png diff --git a/artwork/rewinddisabled.png b/cellprofiler/data/images/rewinddisabled.png similarity index 100% rename from artwork/rewinddisabled.png rename to cellprofiler/data/images/rewinddisabled.png diff --git a/artwork/status_pause.png b/cellprofiler/data/images/status_pause.png similarity index 100% rename from artwork/status_pause.png rename to cellprofiler/data/images/status_pause.png diff --git a/artwork/status_save.png b/cellprofiler/data/images/status_save.png similarity index 100% rename from artwork/status_save.png rename to cellprofiler/data/images/status_save.png diff --git a/artwork/status_stop.png b/cellprofiler/data/images/status_stop.png similarity index 100% rename from artwork/status_stop.png rename to cellprofiler/data/images/status_stop.png diff --git a/artwork/stop.png b/cellprofiler/data/images/stop.png similarity index 100% rename from artwork/stop.png rename to cellprofiler/data/images/stop.png diff --git a/artwork/stopdisabled.png b/cellprofiler/data/images/stopdisabled.png similarity index 100% rename from artwork/stopdisabled.png rename to cellprofiler/data/images/stopdisabled.png diff --git a/artwork/thumb-down.png b/cellprofiler/data/images/thumb-down.png similarity index 100% rename from artwork/thumb-down.png rename to cellprofiler/data/images/thumb-down.png diff --git a/artwork/thumb-up.png b/cellprofiler/data/images/thumb-up.png similarity index 100% rename from artwork/thumb-up.png rename to cellprofiler/data/images/thumb-up.png diff --git a/artwork/unchecked.png b/cellprofiler/data/images/unchecked.png similarity index 100% rename from artwork/unchecked.png rename to cellprofiler/data/images/unchecked.png diff --git a/artwork/welcome_screen_help.png b/cellprofiler/data/images/welcome_screen_help.png similarity index 100% rename from artwork/welcome_screen_help.png rename to cellprofiler/data/images/welcome_screen_help.png diff --git a/artwork/welcomescreen_forum.png b/cellprofiler/data/images/welcomescreen_forum.png similarity index 100% rename from artwork/welcomescreen_forum.png rename to cellprofiler/data/images/welcomescreen_forum.png diff --git a/artwork/welcomescreen_manual.png b/cellprofiler/data/images/welcomescreen_manual.png similarity index 100% rename from artwork/welcomescreen_manual.png rename to cellprofiler/data/images/welcomescreen_manual.png diff --git a/artwork/welcomescreen_tutorials.png b/cellprofiler/data/images/welcomescreen_tutorials.png similarity index 100% rename from artwork/welcomescreen_tutorials.png rename to cellprofiler/data/images/welcomescreen_tutorials.png diff --git a/artwork/window_back.png b/cellprofiler/data/images/window_back.png similarity index 100% rename from artwork/window_back.png rename to cellprofiler/data/images/window_back.png diff --git a/artwork/window_filesave.png b/cellprofiler/data/images/window_filesave.png similarity index 100% rename from artwork/window_filesave.png rename to cellprofiler/data/images/window_filesave.png diff --git a/artwork/window_forward.png b/cellprofiler/data/images/window_forward.png similarity index 100% rename from artwork/window_forward.png rename to cellprofiler/data/images/window_forward.png diff --git a/artwork/window_home.png b/cellprofiler/data/images/window_home.png similarity index 100% rename from artwork/window_home.png rename to cellprofiler/data/images/window_home.png diff --git a/artwork/window_pan.png b/cellprofiler/data/images/window_pan.png similarity index 100% rename from artwork/window_pan.png rename to cellprofiler/data/images/window_pan.png diff --git a/artwork/window_zoom_to_rect.png b/cellprofiler/data/images/window_zoom_to_rect.png similarity index 100% rename from artwork/window_zoom_to_rect.png rename to cellprofiler/data/images/window_zoom_to_rect.png diff --git a/cellprofiler/gui/pipelinecontroller.py b/cellprofiler/gui/pipelinecontroller.py index d8fd78d226..a07d87ef75 100644 --- a/cellprofiler/gui/pipelinecontroller.py +++ b/cellprofiler/gui/pipelinecontroller.py @@ -2302,7 +2302,7 @@ def do_analyze_images(self): ################################## if cellprofiler.preferences.get_wants_pony(): - wx.Sound(os.path.join(cellprofiler.icons.path, "HorseWhinnying.wav")).Play() + wx.Sound(os.path.join(cellprofiler.icons.resources, "HorseWhinnying.wav")).Play() ok, reason = self.__frame.preferences_view.check_preferences() diff --git a/cellprofiler/icons/__init__.py b/cellprofiler/icons/__init__.py index 099ff421b1..e734501b12 100644 --- a/cellprofiler/icons/__init__.py +++ b/cellprofiler/icons/__init__.py @@ -1,13 +1,11 @@ import os.path -import sys import weakref -if hasattr(sys, "frozen"): - path = os.path.split(os.path.abspath(sys.argv[0]))[0] +import pkg_resources - path = os.path.join(path, "artwork") -else: - path = os.path.join(os.path.dirname(os.path.dirname(__path__[0])), "artwork") +images = os.path.join("data", "images") + +resources = pkg_resources.resource_filename("cellprofiler", images) image_cache = weakref.WeakValueDictionary() @@ -18,10 +16,12 @@ def get_builtin_image(name): try: return image_cache[name] except KeyError: - image_cache[name] = image = wx.Image(os.path.join(path, name + ".png")) + pathname = os.path.join(resources, name + ".png") + + image_cache[name] = image = wx.Image(pathname) return image def get_builtin_images_path(): - return os.path.join(path, '') + return os.path.join(resources, "") diff --git a/cellprofiler/worker.py b/cellprofiler/worker.py index 15bfc3d6b8..76bf733977 100644 --- a/cellprofiler/worker.py +++ b/cellprofiler/worker.py @@ -168,7 +168,7 @@ def main(): if sys.platform == "darwin": from cellprofiler.icons import get_builtin_images_path - icon_path = os.path.join(get_builtin_images_path(), "artwork/CellProfilerIcon.png") + icon_path = os.path.join(get_builtin_images_path(), "data/CellProfilerIcon.png") os.environ["APP_NAME_%d" % os.getpid()] = "CellProfilerWorker" os.environ["APP_ICON_%d" % os.getpid()] = icon_path diff --git a/setup.cfg b/setup.cfg index 5c2cb237e2..e06ca07782 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,7 +2,7 @@ argv-emulation = 0 excludes = Tkinter -iconfile = ./artwork/CellProfilerIcon.icns +iconfile = ./cellprofiler/data/images/CellProfilerIcon.icns includes = appdirs, h5py.*, @@ -38,7 +38,7 @@ packages = skimage, zmq resources = - artwork + ./cellprofiler/data/images [py2exe] dll_excludes = diff --git a/setup.py b/setup.py index 11812af94d..3b158b81a8 100644 --- a/setup.py +++ b/setup.py @@ -168,8 +168,14 @@ def run(self): # if self.distribution.data_files is None: self.distribution.data_files = [] + self.distribution.data_files.append( - ("artwork", glob.glob("artwork/*"))) + ( + "cellprofiler/data/images", + glob.glob("cellprofiler/data/images/*") + ) + ) + # # javabridge's jars # @@ -321,7 +327,7 @@ def __compile_command(self): console=[ { "icon_resources": [ - (1, "artwork/CellProfilerIcon.ico") + (1, "cellprofiler/data/images/CellProfilerIcon.ico") ], "script": "CellProfiler.py" } @@ -361,15 +367,11 @@ def __compile_command(self): long_description="", name="CellProfiler", package_data={ - "artwork": glob.glob(os.path.join("artwork", "*")) + "data": glob.glob(os.path.join("data", "images", "*")) }, packages=setuptools.find_packages(exclude=[ - "*.tests", - "*.tests.*", - "tests.*", "tests", - "tutorial" - ]) + ["artwork"], + ]), setup_requires=[ "pytest" ], diff --git a/tests/modules/__init__.py b/tests/modules/__init__.py index 4ab77d3cde..df1f58eb33 100644 --- a/tests/modules/__init__.py +++ b/tests/modules/__init__.py @@ -25,7 +25,8 @@ __temp_example_images_folder = None -cp_logo_url = "https://raw.githubusercontent.com/CellProfiler/CellProfiler/master/artwork/CP_logo.png" +# FIXME: use a stable URI +cp_logo_url = "https://raw.githubusercontent.com/CellProfiler/CellProfiler/0c64193dd9108934400494fffa41d24f3df1573c/artwork/CP_logo.png" cp_logo_url_folder, cp_logo_url_filename = cp_logo_url.rsplit("/", 1) cp_logo_url_shape = (70, 187, 3)