Skip to content

Perform 'blurb split' for master. #2719

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

Closed
wants to merge 13 commits into from
Closed

Perform 'blurb split' for master. #2719

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b5ae220
Perform 'blurb split' for master.
larryhastings Jul 15, 2017
38c8fde
Merge branch 'master' of https://github.com/python/cpython into blurb…
larryhastings Jul 16, 2017
dc85bd9
Fix Doc build for use with blurb.
larryhastings Jul 16, 2017
a8f8d57
Modify Travis configuration to pre-install blurb.
larryhastings Jul 16, 2017
c20bbb9
Add newlines to convince Travis to re-run tests.
larryhastings Jul 16, 2017
d84931b
Trying to diagnose build failure.
larryhastings Jul 22, 2017
64cf545
More debugging stuff.
larryhastings Jul 22, 2017
3d5d159
Force Travis CI retry, as I've updated blurb.
larryhastings Jul 22, 2017
b7f7d37
Update build info to force latest version of blurb.
larryhastings Jul 22, 2017
8377d6a
Touch a C file to *force* a Travis CI build.
larryhastings Jul 22, 2017
43ac140
Merge branch 'master' of github.com:python/cpython into blurb-split-m…
larryhastings Jul 22, 2017
cbc8e93
Merge branch 'blurb-split-master' of github.com:larryhastings/cpython…
larryhastings Jul 22, 2017
a7fb9e9
Update ignored suspicious markup for doc build.
larryhastings Jul 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ matrix:
# Sphinx is pinned so that new versions that introduce new warnings won't suddenly cause build failures.
# (Updating the version is fine as long as no warnings are raised by doing so.)
- python -m pip install sphinx~=1.6.1
- python -m pip install blurb
Copy link
Member

Choose a reason for hiding this comment

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

Suggest something like:
- python -m pip install 'blurb>=1.0.2dev1'

Copy link
Member

Choose a reason for hiding this comment

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

@larryhastings did you push this version? If so, was keeping the dev version on purpose or an accident? If the latter we can just fix the version number and do another release as 1.0.2 so the dependency can be >=1.0.2.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I pushed this version. I don't remember what I changed. I didn't keep the "dev" version on purpose, but then again it is still a little bit under development.

Copy link
Member

@brettcannon brettcannon Jul 22, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

Blurb is under development but is the 1.0.2 release specifically under development? My assumption is you mean the former and not the latter, which means I can push a 1.0.2 release so that the changes in that bugfix release go public because right now no one is getting access since pip considers a dev release unusable without opting in.

script:
- make check suspicious html SPHINXOPTS="-q -W -j4"
- os: linux
Expand Down Expand Up @@ -109,3 +110,4 @@ notifications:
on_success: change
on_failure: always
skip_join: true

5 changes: 4 additions & 1 deletion Doc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ help:
@echo " serve to serve the documentation on the localhost (8000)"

build:
-mkdir build
Copy link
Member

Choose a reason for hiding this comment

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

A more common idiom for this is mkdir -p build. That has the advantage of not producing any messages if the directory already exists.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

blurb merge -f build/NEWS
Copy link
Member

Choose a reason for hiding this comment

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

To get around the PATH problem, suggest:

  1. Adding
    BLURB = $(PYTHON) -m blurb
    after line 8 (SPHINXBUILD = sphinx-build) in the definitions at the top of the file and then
  2. changing the line above to:
    $(BLURB) merge -f build/NEWS
    That way, if users do a make venv ; make html PYTHON=venv/bin/python, blurb will be found there but, if they need to use a different version of blurb, they can override it: make html BLURB=/usr/local/bin/blurb.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

$(SPHINXBUILD) $(ALLSPHINXOPTS)
@echo

Expand Down Expand Up @@ -107,7 +109,7 @@ clean:

venv:
$(PYTHON) -m venv venv
./venv/bin/python3 -m pip install -U Sphinx
./venv/bin/python3 -m pip install -U Sphinx blurb
Copy link
Member

Choose a reason for hiding this comment

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

As above, suggest setting a version requirement here:
./venv/bin/python3 -m pip install -U Sphinx 'blurb>=1.0.2dev1'
That should be future-proof.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.


dist:
rm -rf dist
Expand Down Expand Up @@ -189,3 +191,4 @@ autobuild-stable-html:
exit 1;; \
esac
@make autobuild-dev-html

2 changes: 1 addition & 1 deletion Doc/whatsnew/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
Changelog
+++++++++

.. miscnews:: ../../Misc/NEWS
.. miscnews:: ../build/NEWS
Loading