Skip to content

Backport PRs to maint/5.0#749

Merged
aaronayres35 merged 4 commits into
maint/5.0from
backport-prs
Jun 2, 2021
Merged

Backport PRs to maint/5.0#749
aaronayres35 merged 4 commits into
maint/5.0from
backport-prs

Conversation

@aaronayres35
Copy link
Copy Markdown
Contributor

[targeting maint/5.0]

This PR backports PRs that have been merged into master since maint/5.0 broke off from master. We want these PRs to be included in the upcoming rc.

xiaoyu-wu and others added 4 commits June 2, 2021 11:03
Co-authored-by: Poruri Sai Rahul <rporuri@enthought.com>
* add new chaco.plots submodule

* move contour_line_plot.py and contour_poly_plot.py into chaco/plots/contour

* import from api in tests

* move relevant tests into chaco/plots/tests

* add stub files at old file locations which raise Deprecation warning and import objects from their new chaco/plots modules

* flake8

* update warning message

* set stacklevel=2 in deprecation warnings

* add a chaco.plots.api

* typo

* update deprecation warning messages, and remove module docstrings

* Apply suggestions from code review

Co-authored-by: Poruri Sai Rahul <rporuri@enthought.com>

* ignore stub modules when generating api docs

* flake8

* update api module docstrings

* reorder imports

* suggestions from code review

Co-authored-by: Poruri Sai Rahul <rporuri@enthought.com>
* copy modules into chaco/overlays

* make original modules stubs raising deprecation warnings

* copy layers into overlays

* fully populate chaco.overlays.api and chaco.api

* flake8

* update tox.ini by running flake8 -q

* somehow this is also needed in tox.ini but I did not see this flake8 error locally

* remove bad trailing comma

* move data label test to sit in chaco/overlays/tests

* add stub modules in chaco/layers importing from new location and adding deprecation warnigns.  Also expose layers in the chaco.overlays.api

* add layers to the chaco.api as well

* old files that were moved have since been changed on master and did not get updated in merge of master

* flake8

* typo

* update deprecation warning messages

* remove stub modules from autogenerated api docs

* remove chaco/layers/data

* import from chaco.plots in overlay modules

* import Legend from chaco.overlays.api
@aaronayres35 aaronayres35 requested a review from rahulporuri June 2, 2021 16:04
@aaronayres35
Copy link
Copy Markdown
Contributor Author

@rahulporuri I don't remember if we knew this already, but looks like I am not required to get an approving review to merge PRs to this branch

Copy link
Copy Markdown
Contributor

@rahulporuri rahulporuri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@rahulporuri
Copy link
Copy Markdown
Contributor

rahulporuri commented Jun 2, 2021

@rahulporuri I don't remember if we knew this already, but looks like I am not required to get an approving review to merge PRs to this branch

Fixing now. Fixed

@aaronayres35 aaronayres35 merged commit f923c6d into maint/5.0 Jun 2, 2021
@aaronayres35 aaronayres35 deleted the backport-prs branch June 2, 2021 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants