Skip to content
This repository has been archived by the owner on Dec 10, 2020. It is now read-only.

Commit

Permalink
typo in the changelog screwed it up for the 0.0.33 release Also fixed…
Browse files Browse the repository at this point in the history
… formatting of globs and rglobs which were reporting errors from publish_docs

A typo in the changelog screwed it up for the 0.0.33 release.
Also sort of fixed formatting of globs and rglobs which were reporting errors from publish_docs, but they still don't look great in the BUILD dictionary.

Testing Done:
Ran ./build-support/bin/publish-docs.sh.  Staged at http://pantsbuild.github.io/staging/zundel

Bugs closed: 1691

Reviewed at https://rbcommons.com/s/twitter/r/2376/
  • Loading branch information
ericzundel committed Jun 16, 2015
1 parent 2da2619 commit 1cf240b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/python/pants/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ API Changes
~~~~~~~~~~~

* Removed --project-info flag from depmap goal
`RB #2363 https://rbcommons.com/s/twitter/r/2363/>`_
`RB #2363 <https://rbcommons.com/s/twitter/r/2363>`_

* Deprecate PytestRun env vars.
`RB #2299 <https://rbcommons.com/s/twitter/r/2299>`_
Expand Down
20 changes: 9 additions & 11 deletions src/python/pants/backend/core/wrapped_globs.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,20 +120,18 @@ class Globs(FilesetRelPathWrapper):
E.g., ``sources = globs('*java'),`` to get .java files in this directory.
:param exclude: a list of {,r,z}globs objects, strings, or lists of
strings to exclude. E.g. ``globs('*',exclude=[globs('*.java'),
'foo.py'])`` gives all files in this directory except ``.java``
files and ``foo.py``.
strings to exclude. E.g. ``globs('*',exclude=[globs('*.java'),
'foo.py'])`` gives all files in this directory except ``.java``
files and ``foo.py``.
:return: FilesetWithSpec containing matching files in same directory as this BUILD file.
:rtype: FilesetWithSpec
Deprecated:
You might see that old code uses "math" on the return value of
``globs()``. E.g., ``globs('*') - globs('*.java')`` gives all files
in this directory *except* ``.java`` files. Please use exclude
instead, since pants is moving to make BUILD files easier to parse,
and the new grammar will not support arithmetic.
:returns FilesetWithSpec containing matching files in same directory as this BUILD file.
:rtype FilesetWithSpec
"""
wrapped_fn = Fileset.globs

Expand All @@ -145,16 +143,16 @@ class RGlobs(FilesetRelPathWrapper):
the config, config/foo, config/foo/bar directories.
:param exclude: a list of {,r,z}globs objects, strings, or lists of
strings to exclude. E.g. ``rglobs('config/*',exclude=[globs('config/*.java'),
'config/foo.py'])`` gives all files under config except ``.java`` files and ``config/foo.py``.
strings to exclude. E.g. ``rglobs('config/*',exclude=[globs('config/*.java'),
'config/foo.py'])`` gives all files under config except ``.java`` files and ``config/foo.py``.
:return: FilesetWithSpec matching files in this directory and its descendents.
:rtype: FilesetWithSpec
Deprecated:
You might see that old code uses "math" on the return value of ``rglobs()``. E.g.,
``rglobs('config/*') - rglobs('config/foo/*')`` gives all files under `config` *except*
those in ``config/foo``. Please use exclude instead, since pants is moving to
make BUILD files easier to parse, and the new grammar will not support arithmetic.
:returns FilesetWithSpec matching files in this directory and its descendents.
:rtype FilesetWithSpec
"""
@staticmethod
def rglobs_following_symlinked_dirs_by_default(*globspecs, **kw):
Expand Down

0 comments on commit 1cf240b

Please sign in to comment.