use the setuptools.setup package_data parameter

CellProfiler · Jul 7, 2017 · 2897fcf · 2897fcf
1 parent 0c64193
commit 2897fcf
Show file tree

Hide file tree

Showing 124 changed files with 24 additions and 23 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1 @@
 include LICENSE
-
-recursive-include artwork *
diff --git a/artwork/Align.png → cellprofiler/data/images/Align.png b/artwork/Align.png → cellprofiler/data/images/Align.png
diff --git a/artwork/ApplyThreshold.png → cellprofiler/data/images/ApplyThreshold.png b/artwork/ApplyThreshold.png → cellprofiler/data/images/ApplyThreshold.png
diff --git a/artwork/BroadPlusImagingPlusBanner.png → ...ata/images/BroadPlusImagingPlusBanner.png b/artwork/BroadPlusImagingPlusBanner.png → ...ata/images/BroadPlusImagingPlusBanner.png
diff --git a/artwork/CPCoverPage.png → cellprofiler/data/images/CPCoverPage.png b/artwork/CPCoverPage.png → cellprofiler/data/images/CPCoverPage.png
diff --git a/artwork/CP_logo.png → cellprofiler/data/images/CP_logo.png b/artwork/CP_logo.png → cellprofiler/data/images/CP_logo.png
diff --git a/artwork/CSAIL_Logo.png → cellprofiler/data/images/CSAIL_Logo.png b/artwork/CSAIL_Logo.png → cellprofiler/data/images/CSAIL_Logo.png
diff --git a/artwork/CellProfilerIcon.icns → ...rofiler/data/images/CellProfilerIcon.icns b/artwork/CellProfilerIcon.icns → ...rofiler/data/images/CellProfilerIcon.icns
diff --git a/artwork/CellProfilerIcon.ico → ...profiler/data/images/CellProfilerIcon.ico b/artwork/CellProfilerIcon.ico → ...profiler/data/images/CellProfilerIcon.ico
diff --git a/artwork/CellProfilerIcon.png → ...profiler/data/images/CellProfilerIcon.png b/artwork/CellProfilerIcon.png → ...profiler/data/images/CellProfilerIcon.png
diff --git a/artwork/CellProfilerIcon_old.png → ...iler/data/images/CellProfilerIcon_old.png b/artwork/CellProfilerIcon_old.png → ...iler/data/images/CellProfilerIcon_old.png
diff --git a/artwork/CellProfilerSplash.png → ...ofiler/data/images/CellProfilerSplash.png b/artwork/CellProfilerSplash.png → ...ofiler/data/images/CellProfilerSplash.png
diff --git a/artwork/CellProfilersplash.psd → ...ofiler/data/images/CellProfilersplash.psd b/artwork/CellProfilersplash.psd → ...ofiler/data/images/CellProfilersplash.psd
diff --git a/artwork/CollapseTree.png → cellprofiler/data/images/CollapseTree.png b/artwork/CollapseTree.png → cellprofiler/data/images/CollapseTree.png
diff --git a/artwork/ColorToGray.png → cellprofiler/data/images/ColorToGray.png b/artwork/ColorToGray.png → cellprofiler/data/images/ColorToGray.png
diff --git a/artwork/CorrectIlluminationApply.png → .../data/images/CorrectIlluminationApply.png b/artwork/CorrectIlluminationApply.png → .../data/images/CorrectIlluminationApply.png
diff --git a/artwork/CorrectIlluminationCalculate.png → ...a/images/CorrectIlluminationCalculate.png b/artwork/CorrectIlluminationCalculate.png → ...a/images/CorrectIlluminationCalculate.png
diff --git a/artwork/Crop.png → cellprofiler/data/images/Crop.png b/artwork/Crop.png → cellprofiler/data/images/Crop.png
diff --git a/artwork/ExpandOrShrinkObjects.png → ...ler/data/images/ExpandOrShrinkObjects.png b/artwork/ExpandOrShrinkObjects.png → ...ler/data/images/ExpandOrShrinkObjects.png
diff --git a/artwork/ExpandTree.png → cellprofiler/data/images/ExpandTree.png b/artwork/ExpandTree.png → cellprofiler/data/images/ExpandTree.png
diff --git a/artwork/Gear.png → cellprofiler/data/images/Gear.png b/artwork/Gear.png → cellprofiler/data/images/Gear.png
diff --git a/artwork/GrayToColor.png → cellprofiler/data/images/GrayToColor.png b/artwork/GrayToColor.png → cellprofiler/data/images/GrayToColor.png
diff --git a/artwork/Groups_ExampleDisplayTable.png → ...ata/images/Groups_ExampleDisplayTable.png b/artwork/Groups_ExampleDisplayTable.png → ...ata/images/Groups_ExampleDisplayTable.png
diff --git a/artwork/HorseWhinnying.wav → cellprofiler/data/images/HorseWhinnying.wav b/artwork/HorseWhinnying.wav → cellprofiler/data/images/HorseWhinnying.wav
diff --git a/artwork/IMG_ANALYZE_16.png → cellprofiler/data/images/IMG_ANALYZE_16.png b/artwork/IMG_ANALYZE_16.png → cellprofiler/data/images/IMG_ANALYZE_16.png
diff --git a/artwork/IMG_ANALYZE_24.png → cellprofiler/data/images/IMG_ANALYZE_24.png b/artwork/IMG_ANALYZE_24.png → cellprofiler/data/images/IMG_ANALYZE_24.png
diff --git a/artwork/IMG_CLOSED_EYE.png → cellprofiler/data/images/IMG_CLOSED_EYE.png b/artwork/IMG_CLOSED_EYE.png → cellprofiler/data/images/IMG_CLOSED_EYE.png
diff --git a/artwork/IMG_DISABLED.png → cellprofiler/data/images/IMG_DISABLED.png b/artwork/IMG_DISABLED.png → cellprofiler/data/images/IMG_DISABLED.png
diff --git a/artwork/IMG_ERROR.png → cellprofiler/data/images/IMG_ERROR.png b/artwork/IMG_ERROR.png → cellprofiler/data/images/IMG_ERROR.png
diff --git a/artwork/IMG_EYE.png → cellprofiler/data/images/IMG_EYE.png b/artwork/IMG_EYE.png → cellprofiler/data/images/IMG_EYE.png
diff --git a/artwork/IMG_GO.png → cellprofiler/data/images/IMG_GO.png b/artwork/IMG_GO.png → cellprofiler/data/images/IMG_GO.png
diff --git a/artwork/IMG_IMAGE.png → cellprofiler/data/images/IMG_IMAGE.png b/artwork/IMG_IMAGE.png → cellprofiler/data/images/IMG_IMAGE.png
diff --git a/artwork/IMG_OK.png → cellprofiler/data/images/IMG_OK.png b/artwork/IMG_OK.png → cellprofiler/data/images/IMG_OK.png
diff --git a/artwork/IMG_PAUSE.png → cellprofiler/data/images/IMG_PAUSE.png b/artwork/IMG_PAUSE.png → cellprofiler/data/images/IMG_PAUSE.png
diff --git a/artwork/IMG_RUN.png → cellprofiler/data/images/IMG_RUN.png b/artwork/IMG_RUN.png → cellprofiler/data/images/IMG_RUN.png
diff --git a/artwork/IMG_SLIDER.png → cellprofiler/data/images/IMG_SLIDER.png b/artwork/IMG_SLIDER.png → cellprofiler/data/images/IMG_SLIDER.png
diff --git a/artwork/IMG_SLIDER_ACTIVE.png → ...rofiler/data/images/IMG_SLIDER_ACTIVE.png b/artwork/IMG_SLIDER_ACTIVE.png → ...rofiler/data/images/IMG_SLIDER_ACTIVE.png
diff --git a/artwork/IMG_STOP.png → cellprofiler/data/images/IMG_STOP.png b/artwork/IMG_STOP.png → cellprofiler/data/images/IMG_STOP.png
diff --git a/artwork/IMG_TEST.png → cellprofiler/data/images/IMG_TEST.png b/artwork/IMG_TEST.png → cellprofiler/data/images/IMG_TEST.png
diff --git a/artwork/IMG_UNAVAILABLE.png → cellprofiler/data/images/IMG_UNAVAILABLE.png b/artwork/IMG_UNAVAILABLE.png → cellprofiler/data/images/IMG_UNAVAILABLE.png
diff --git a/artwork/IMG_WARN.png → cellprofiler/data/images/IMG_WARN.png b/artwork/IMG_WARN.png → cellprofiler/data/images/IMG_WARN.png
diff --git a/...ifyPrimaryObjects_IntensityDeclumping.png → ...ifyPrimaryObjects_IntensityDeclumping.png b/...ifyPrimaryObjects_IntensityDeclumping.png → ...ifyPrimaryObjects_IntensityDeclumping.png
diff --git a/...dentifyPrimaryObjects_ShapeDeclumping.png → ...dentifyPrimaryObjects_ShapeDeclumping.png b/...dentifyPrimaryObjects_ShapeDeclumping.png → ...dentifyPrimaryObjects_ShapeDeclumping.png
diff --git a/artwork/IdentifySecondaryObjects.png → .../data/images/IdentifySecondaryObjects.png b/artwork/IdentifySecondaryObjects.png → .../data/images/IdentifySecondaryObjects.png
diff --git a/artwork/IdentifyTertiaryObjects.png → ...r/data/images/IdentifyTertiaryObjects.png b/artwork/IdentifyTertiaryObjects.png → ...r/data/images/IdentifyTertiaryObjects.png
diff --git a/artwork/Images_FilelistPanel.png → ...iler/data/images/Images_FilelistPanel.png b/artwork/Images_FilelistPanel.png → ...iler/data/images/Images_FilelistPanel.png
diff --git a/artwork/Images_FilelistPanel_Blank.png → ...ata/images/Images_FilelistPanel_Blank.png b/artwork/Images_FilelistPanel_Blank.png → ...ata/images/Images_FilelistPanel_Blank.png
diff --git a/artwork/Images_FilelistPanel_Filled.png → ...ta/images/Images_FilelistPanel_Filled.png b/artwork/Images_FilelistPanel_Filled.png → ...ta/images/Images_FilelistPanel_Filled.png
diff --git a/artwork/Images_UsingRules.png → ...rofiler/data/images/Images_UsingRules.png b/artwork/Images_UsingRules.png → ...rofiler/data/images/Images_UsingRules.png
diff --git a/artwork/MeasureImageAreaOccupied.png → .../data/images/MeasureImageAreaOccupied.png b/artwork/MeasureImageAreaOccupied.png → .../data/images/MeasureImageAreaOccupied.png
diff --git a/...k/MeasureObjectSizeShape_Eccentricity.png → ...s/MeasureObjectSizeShape_Eccentricity.png b/...k/MeasureObjectSizeShape_Eccentricity.png → ...s/MeasureObjectSizeShape_Eccentricity.png
diff --git a/artwork/MeasureTexture.png → cellprofiler/data/images/MeasureTexture.png b/artwork/MeasureTexture.png → cellprofiler/data/images/MeasureTexture.png
diff --git a/artwork/Metadata_ExampleDisplayTable.png → ...a/images/Metadata_ExampleDisplayTable.png b/artwork/Metadata_ExampleDisplayTable.png → ...a/images/Metadata_ExampleDisplayTable.png
diff --git a/...ork/NamesAndTypes_ExampleDisplayTable.png → ...ges/NamesAndTypes_ExampleDisplayTable.png b/...ork/NamesAndTypes_ExampleDisplayTable.png → ...ges/NamesAndTypes_ExampleDisplayTable.png
diff --git a/artwork/OMERO_imageID_screenshot.png → .../data/images/OMERO_imageID_screenshot.png b/artwork/OMERO_imageID_screenshot.png → .../data/images/OMERO_imageID_screenshot.png
diff --git a/artwork/OMERO_login_screenshot.png → ...er/data/images/OMERO_login_screenshot.png b/artwork/OMERO_login_screenshot.png → ...er/data/images/OMERO_login_screenshot.png
diff --git a/artwork/Tile.png → cellprofiler/data/images/Tile.png b/artwork/Tile.png → cellprofiler/data/images/Tile.png
diff --git a/artwork/WhiteheadInstituteLogo.png → ...er/data/images/WhiteheadInstituteLogo.png b/artwork/WhiteheadInstituteLogo.png → ...er/data/images/WhiteheadInstituteLogo.png
diff --git a/artwork/check.png → cellprofiler/data/images/check.png b/artwork/check.png → cellprofiler/data/images/check.png
diff --git a/artwork/color.png → cellprofiler/data/images/color.png b/artwork/color.png → cellprofiler/data/images/color.png
diff --git a/artwork/cp_panel_schematic.png → ...ofiler/data/images/cp_panel_schematic.png b/artwork/cp_panel_schematic.png → ...ofiler/data/images/cp_panel_schematic.png
diff --git a/artwork/dapi.png → cellprofiler/data/images/dapi.png b/artwork/dapi.png → cellprofiler/data/images/dapi.png
diff --git a/artwork/delete.png → cellprofiler/data/images/delete.png b/artwork/delete.png → cellprofiler/data/images/delete.png
diff --git a/artwork/downarrow.png → cellprofiler/data/images/downarrow.png b/artwork/downarrow.png → cellprofiler/data/images/downarrow.png
diff --git a/artwork/eye-close.png → cellprofiler/data/images/eye-close.png b/artwork/eye-close.png → cellprofiler/data/images/eye-close.png
diff --git a/artwork/eye-open.png → cellprofiler/data/images/eye-open.png b/artwork/eye-open.png → cellprofiler/data/images/eye-open.png
diff --git a/artwork/ffwd.png → cellprofiler/data/images/ffwd.png b/artwork/ffwd.png → cellprofiler/data/images/ffwd.png
diff --git a/artwork/ffwddisabled.png → cellprofiler/data/images/ffwddisabled.png b/artwork/ffwddisabled.png → cellprofiler/data/images/ffwddisabled.png
diff --git a/artwork/filter.png → cellprofiler/data/images/filter.png b/artwork/filter.png → cellprofiler/data/images/filter.png
diff --git a/artwork/folder_browse.png → cellprofiler/data/images/folder_browse.png b/artwork/folder_browse.png → cellprofiler/data/images/folder_browse.png
diff --git a/artwork/folder_create.png → cellprofiler/data/images/folder_create.png b/artwork/folder_create.png → cellprofiler/data/images/folder_create.png
diff --git a/artwork/folder_refresh.png → cellprofiler/data/images/folder_refresh.png b/artwork/folder_refresh.png → cellprofiler/data/images/folder_refresh.png
diff --git a/artwork/gfp.png → cellprofiler/data/images/gfp.png b/artwork/gfp.png → cellprofiler/data/images/gfp.png
diff --git a/artwork/icon_copyrights.txt → cellprofiler/data/images/icon_copyrights.txt b/artwork/icon_copyrights.txt → cellprofiler/data/images/icon_copyrights.txt
diff --git a/artwork/illumination_function.png → ...ler/data/images/illumination_function.png b/artwork/illumination_function.png → ...ler/data/images/illumination_function.png
diff --git a/artwork/image_to_object_dataflow.png → .../data/images/image_to_object_dataflow.png b/artwork/image_to_object_dataflow.png → .../data/images/image_to_object_dataflow.png
diff --git a/artwork/image_to_object_dataflow.psd → .../data/images/image_to_object_dataflow.psd b/artwork/image_to_object_dataflow.psd → .../data/images/image_to_object_dataflow.psd
diff --git a/artwork/logo.png → cellprofiler/data/images/logo.png b/artwork/logo.png → cellprofiler/data/images/logo.png
diff --git a/artwork/mask.png → cellprofiler/data/images/mask.png b/artwork/mask.png → cellprofiler/data/images/mask.png
diff --git a/artwork/microscope-color_16.png → ...filer/data/images/microscope-color_16.png b/artwork/microscope-color_16.png → ...filer/data/images/microscope-color_16.png
diff --git a/artwork/microscope-icon_16.png → ...ofiler/data/images/microscope-icon_16.png b/artwork/microscope-icon_16.png → ...ofiler/data/images/microscope-icon_16.png
diff --git a/artwork/microscope-icon_32.png → ...ofiler/data/images/microscope-icon_32.png b/artwork/microscope-icon_32.png → ...ofiler/data/images/microscope-icon_32.png
diff --git a/artwork/microscopes_16.png → cellprofiler/data/images/microscopes_16.png b/artwork/microscopes_16.png → cellprofiler/data/images/microscopes_16.png
diff --git a/artwork/module_add.png → cellprofiler/data/images/module_add.png b/artwork/module_add.png → cellprofiler/data/images/module_add.png
diff --git a/artwork/module_help.png → cellprofiler/data/images/module_help.png b/artwork/module_help.png → cellprofiler/data/images/module_help.png
diff --git a/artwork/module_movedown.png → cellprofiler/data/images/module_movedown.png b/artwork/module_movedown.png → cellprofiler/data/images/module_movedown.png
diff --git a/artwork/module_moveup.png → cellprofiler/data/images/module_moveup.png b/artwork/module_moveup.png → cellprofiler/data/images/module_moveup.png
diff --git a/artwork/module_remove.png → cellprofiler/data/images/module_remove.png b/artwork/module_remove.png → cellprofiler/data/images/module_remove.png
diff --git a/artwork/monochrome.png → cellprofiler/data/images/monochrome.png b/artwork/monochrome.png → cellprofiler/data/images/monochrome.png
diff --git a/artwork/movie_16.png → cellprofiler/data/images/movie_16.png b/artwork/movie_16.png → cellprofiler/data/images/movie_16.png
diff --git a/artwork/next.png → cellprofiler/data/images/next.png b/artwork/next.png → cellprofiler/data/images/next.png
diff --git a/artwork/objects.png → cellprofiler/data/images/objects.png b/artwork/objects.png → cellprofiler/data/images/objects.png
diff --git a/artwork/pause.png → cellprofiler/data/images/pause.png b/artwork/pause.png → cellprofiler/data/images/pause.png
diff --git a/artwork/pausedisabled.png → cellprofiler/data/images/pausedisabled.png b/artwork/pausedisabled.png → cellprofiler/data/images/pausedisabled.png
diff --git a/artwork/play.png → cellprofiler/data/images/play.png b/artwork/play.png → cellprofiler/data/images/play.png
diff --git a/artwork/playdisabled.png → cellprofiler/data/images/playdisabled.png b/artwork/playdisabled.png → cellprofiler/data/images/playdisabled.png
diff --git a/artwork/previous.png → cellprofiler/data/images/previous.png b/artwork/previous.png → cellprofiler/data/images/previous.png
diff --git a/artwork/remove-sign.png → cellprofiler/data/images/remove-sign.png b/artwork/remove-sign.png → cellprofiler/data/images/remove-sign.png
diff --git a/artwork/rewind.png → cellprofiler/data/images/rewind.png b/artwork/rewind.png → cellprofiler/data/images/rewind.png
diff --git a/artwork/rewinddisabled.png → cellprofiler/data/images/rewinddisabled.png b/artwork/rewinddisabled.png → cellprofiler/data/images/rewinddisabled.png
diff --git a/artwork/status_pause.png → cellprofiler/data/images/status_pause.png b/artwork/status_pause.png → cellprofiler/data/images/status_pause.png
diff --git a/artwork/status_save.png → cellprofiler/data/images/status_save.png b/artwork/status_save.png → cellprofiler/data/images/status_save.png
diff --git a/artwork/status_stop.png → cellprofiler/data/images/status_stop.png b/artwork/status_stop.png → cellprofiler/data/images/status_stop.png
diff --git a/artwork/stop.png → cellprofiler/data/images/stop.png b/artwork/stop.png → cellprofiler/data/images/stop.png
diff --git a/artwork/stopdisabled.png → cellprofiler/data/images/stopdisabled.png b/artwork/stopdisabled.png → cellprofiler/data/images/stopdisabled.png
diff --git a/artwork/thumb-down.png → cellprofiler/data/images/thumb-down.png b/artwork/thumb-down.png → cellprofiler/data/images/thumb-down.png
diff --git a/artwork/thumb-up.png → cellprofiler/data/images/thumb-up.png b/artwork/thumb-up.png → cellprofiler/data/images/thumb-up.png
diff --git a/artwork/unchecked.png → cellprofiler/data/images/unchecked.png b/artwork/unchecked.png → cellprofiler/data/images/unchecked.png
diff --git a/artwork/welcome_screen_help.png → ...filer/data/images/welcome_screen_help.png b/artwork/welcome_screen_help.png → ...filer/data/images/welcome_screen_help.png
diff --git a/artwork/welcomescreen_forum.png → ...filer/data/images/welcomescreen_forum.png b/artwork/welcomescreen_forum.png → ...filer/data/images/welcomescreen_forum.png
diff --git a/artwork/welcomescreen_manual.png → ...iler/data/images/welcomescreen_manual.png b/artwork/welcomescreen_manual.png → ...iler/data/images/welcomescreen_manual.png
diff --git a/artwork/welcomescreen_tutorials.png → ...r/data/images/welcomescreen_tutorials.png b/artwork/welcomescreen_tutorials.png → ...r/data/images/welcomescreen_tutorials.png
diff --git a/artwork/window_back.png → cellprofiler/data/images/window_back.png b/artwork/window_back.png → cellprofiler/data/images/window_back.png
diff --git a/artwork/window_filesave.png → cellprofiler/data/images/window_filesave.png b/artwork/window_filesave.png → cellprofiler/data/images/window_filesave.png
diff --git a/artwork/window_forward.png → cellprofiler/data/images/window_forward.png b/artwork/window_forward.png → cellprofiler/data/images/window_forward.png
diff --git a/artwork/window_home.png → cellprofiler/data/images/window_home.png b/artwork/window_home.png → cellprofiler/data/images/window_home.png
diff --git a/artwork/window_pan.png → cellprofiler/data/images/window_pan.png b/artwork/window_pan.png → cellprofiler/data/images/window_pan.png
diff --git a/artwork/window_zoom_to_rect.png → ...filer/data/images/window_zoom_to_rect.png b/artwork/window_zoom_to_rect.png → ...filer/data/images/window_zoom_to_rect.png
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)