Skip to content

Conversation

@arm4b
Copy link
Member

@arm4b arm4b commented Aug 3, 2020

Cherry-picking changes into v3.2 branch from the (#4957) which should fix st2docs builds for stable branch.

  • Pin pip to 20.0.2 consistently across the Makefile targets
  • Remove virtualenv and pip installation from Travis yaml
  • Fix st2docs build relying on st2 master makefiles
    (cherry picked from commit 29ca930)

Also cherry-picking lint changes made by @Sheshagiri in #4947

See StackStorm/st2docs#1001 StackStorm/st2docs#999 which are blocked by the CI failures in st2 v3.2 branch.

…ld (#4957)

* Pin pip to 20.0.2 consistently across the Makefile targets
* Remove virtualenv and pip installation from Travis yaml
* Fix st2docs build relying on st2 master makefiles
(cherry picked from commit 29ca930)
@arm4b arm4b added the bug label Aug 3, 2020
@pull-request-size pull-request-size bot added the size/S PR that changes 10-29 lines. Very easy to review. label Aug 3, 2020
(cherry picked from commit edcb98a)
(cherry picked from commit 763c0f5)
@pull-request-size pull-request-size bot added size/M PR that changes 30-99 lines. Good size to review. and removed size/S PR that changes 10-29 lines. Very easy to review. labels Aug 3, 2020
@arm4b
Copy link
Member Author

arm4b commented Aug 3, 2020

Will merge as is as all I need from this PR are Makefile and Linting fixes for st2docs to work.

@arm4b arm4b requested a review from a team August 3, 2020 16:05
Copy link
Contributor

@LindsayHill LindsayHill left a comment

Choose a reason for hiding this comment

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

Had hoped to not need to do this, but I guess it's worth doing

@arm4b arm4b merged commit f348a62 into v3.2 Aug 3, 2020
@arm4b arm4b deleted the fix/3.2-docs branch August 3, 2020 18:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug size/M PR that changes 30-99 lines. Good size to review.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants