Skip to content

Pull PRs from maint/5.2 back into master #844

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.

Sign up for GitHub

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

Merged
aaronayres35 merged 2 commits into from
Jun 11, 2021
Merged

Pull PRs from maint/5.2 back into master #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c7d149
explicitly require pyface>=7.2 since we use pyface.undo (#833)
aaronayres35 Jun 1, 2021
62eebb5
include pyproject.toml in manifset (#836)
aaronayres35 Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ include docs/kiva/agg/notes
include kiva/_cython_speedups.*
include kiva/_hit_test.*
include kiva/_marker_renderer.*
include pyproject.toml
recursive-include docs *.py *.rst *.txt *.css *.png *.ico *.doc
recursive-include enable/examples *.py *.svg *.jpg *.enaml
recursive-include kiva/examples *.py *.txt *.gif *.jpg
Expand Down
2 changes: 1 addition & 1 deletion enable/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
__version__ = "not-built"

__requires__ = [
"numpy", "pillow", "traits>=6.2.0", "traitsui", "pyface", "fonttools"
"numpy", "pillow", "traits>=6.2.0", "traitsui", "pyface>=7.2.0", "fonttools"
]

__extras_require__ = {
Expand Down