Skip to content

Commit 012aa6b

Browse files
aaronayres35Poruri Sai Rahulkitchoi
authored
Backports for 7.2.0 and update changelog (#838)
* CLN : Remove commented out/dead code (#833) * Update image license files (#818) * DEV : Add CC-BY-3.0 license file and include it in the pyface distribution new file: LICENSE-CC-BY-3.0.txt modified: MANIFEST.in * DEV : Move license content to main image license file and delete the now redundant license file deleted: examples/application/python_editor/images/image_LICENSE.txt modified: image_LICENSE.txt * DEV : Move more license information to top level image license file deleted: examples/application/python_shell/images/image_LICENSE.txt modified: image_LICENSE.txt * DEV : More more license info into image license file and remove the duplicate info file deleted: examples/data_view/images/image_LICENSE.txt modified: image_LICENSE.txt * DEV : More more license info into top level image license file deleted: examples/dock/images/image_LICENSE.txt modified: image_LICENSE.txt * DEV : More some more license info into top level license file deleted: examples/images/image_LICENSE.txt modified: image_LICENSE.txt * DEV : Move some more license info into top level image license file deleted: examples/tasks/advanced/images/image_LICENSE.txt modified: image_LICENSE.txt * DEV : Move more license info into top level image license file deleted: examples/tasks/basic/images/image_LICENSE.txt modified: image_LICENSE.txt * CLN : Remove redundant license file deleted: examples/workbench/images/image_LICENSE.txt * CLN : Remove outdated/redundant license file deleted: pyface/action/images/image_LICENSE.txt * CLN : Remove redundant/outdated image license file deleted: pyface/dock/images/image_LICENSE.txt * DEV : Move more license info to top level image license file modified: image_LICENSE.txt deleted: pyface/images/image_LICENSE.txt * DEV : More more license info to top level image license file modified: image_LICENSE.txt deleted: pyface/tests/images/image_LICENSE.txt * DEV : Move more license info to top level image license file modified: image_LICENSE.txt deleted: pyface/tree/images/image_LICENSE.txt * CLN : Remove another redundant/unnecessary image license file deleted: pyface/ui/qt4/images/image_LICENSE.txt * CLN : Remove unnecessary/redundant image license file deleted: pyface/ui/wx/grid/images/image_LICENSE.txt * DEV : More more license info to top level image license file modified: image_LICENSE.txt deleted: pyface/ui/wx/images/image_LICENSE.txt * CLN : Remove duplicate information modified: image_LICENSE.txt * CLN : Remove Enthought-licensed content from image license file modified: image_LICENSE.txt * Fix loading resource images from a module that is not a package (#836) * Fix loading resource files from a module that is not a package * Replace module name with just the module This is an optimization but is also safer: importlib_resources will resolve the module name back to the module. * Change IOError to OSError to be consistent Since Python 3.3, IOError is simply alias of OSError * update changelog with relevant backported PR * Revert "update changelog with relevant backported PR" This reverts commit 9b3cf77. Co-authored-by: Poruri Sai Rahul <rporuri@enthought.com> Co-authored-by: Kit Choi <kitchoi@users.noreply.github.com>
1 parent 765b758 commit 012aa6b

File tree

22 files changed

+527
-351
lines changed

22 files changed

+527
-351
lines changed

LICENSE-CC-BY-3.0.txt

Lines changed: 319 additions & 0 deletions
Large diffs are not rendered by default.

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ include image_LICENSE.txt
22
include image_LICENSE_Eclipse.txt
33
include image_LICENSE_Nuvola.txt
44
include image_LICENSE_OOo.txt
5+
include LICENSE-CC-BY-3.0.txt
56
include LICENSE.txt
67
include README.rst
78
include MANIFEST.in

examples/application/python_editor/images/image_LICENSE.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.

examples/application/python_shell/images/image_LICENSE.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

examples/data_view/images/image_LICENSE.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

examples/dock/images/image_LICENSE.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

examples/images/image_LICENSE.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.

examples/tasks/advanced/images/image_LICENSE.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

examples/tasks/basic/images/image_LICENSE.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

examples/workbench/images/image_LICENSE.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)