Update changelog and README (#1392)

* add two CHANGELOG entries

* update README on command-line options

diff --git a/CHANGES.md b/CHANGES.md
index 22293f14c41b367558d5980a24bddc3f6acdd225..e4d7ee36101da86906b6122982dbe5ac4f1e2daa 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,10 @@
 
 - move to 'py3' tagged wheels (#1388)
 
 
 - move to 'py3' tagged wheels (#1388)
 

+- remove deprecated `--py36` option (#1236)
+
+- add `--force-exclude` argument (#1032)
+

 #### Vim plugin
 
 - prefer virtualenv packages over global packages (#1383)
 #### Vim plugin
 
 - prefer virtualenv packages over global packages (#1383)

diff --git a/README.md b/README.md
index def311ff2fbaab29eea816d99767ca2124536d0c..d0148b54017e7a8956c0cb7e0bd0bac979e8baa9 100644 (file)
--- a/README.md
+++ b/README.md
@@ -61,30 +61,41 @@ black {source_file_or_directory}
 _Black_ doesn't provide many options. You can list them by running `black --help`:
 
 ```text
 _Black_ doesn't provide many options. You can list them by running `black --help`:
 
 ```text

-black [OPTIONS] [SRC]...
+Usage: black [OPTIONS] [SRC]...
+
+  The uncompromising code formatter.

 
 Options:
   -c, --code TEXT                 Format the code passed in as a string.
   -l, --line-length INTEGER       How many characters per line to allow.
                                   [default: 88]
 
 Options:
   -c, --code TEXT                 Format the code passed in as a string.
   -l, --line-length INTEGER       How many characters per line to allow.
                                   [default: 88]

+

   -t, --target-version [py27|py33|py34|py35|py36|py37|py38]
                                   Python versions that should be supported by
                                   Black's output. [default: per-file auto-
                                   detection]
   -t, --target-version [py27|py33|py34|py35|py36|py37|py38]
                                   Python versions that should be supported by
                                   Black's output. [default: per-file auto-
                                   detection]

+

   --pyi                           Format all input files like typing stubs
                                   regardless of file extension (useful when
                                   piping source on standard input).
   --pyi                           Format all input files like typing stubs
                                   regardless of file extension (useful when
                                   piping source on standard input).

+

   -S, --skip-string-normalization
                                   Don't normalize string quotes or prefixes.
   --check                         Don't write the files back, just return the
                                   status.  Return code 0 means nothing would
                                   change.  Return code 1 means some files
   -S, --skip-string-normalization
                                   Don't normalize string quotes or prefixes.
   --check                         Don't write the files back, just return the
                                   status.  Return code 0 means nothing would
                                   change.  Return code 1 means some files

-                                  would be reformatted.  Return code 123 means
+                                  would be reformatted. Return code 123 means

                                   there was an internal error.
                                   there was an internal error.

+

   --diff                          Don't write the files back, just output a
                                   diff for each file on stdout.
   --diff                          Don't write the files back, just output a
                                   diff for each file on stdout.

+
+  --color / --no-color            Show colored diff. Only applies when
+                                  `--diff` is given.
+

   --fast / --safe                 If --fast given, skip temporary sanity
                                   checks. [default: --safe]
   --fast / --safe                 If --fast given, skip temporary sanity
                                   checks. [default: --safe]

+

   --include TEXT                  A regular expression that matches files and
                                   directories that should be included on
                                   recursive searches.  An empty value means
   --include TEXT                  A regular expression that matches files and
                                   directories that should be included on
                                   recursive searches.  An empty value means


@@ -93,6 +104,7 @@ Options:
                                   on all platforms (Windows, too).  Exclusions
                                   are calculated first, inclusions later.
                                   [default: \.pyi?$]
                                   on all platforms (Windows, too).  Exclusions
                                   are calculated first, inclusions later.
                                   [default: \.pyi?$]

+

   --exclude TEXT                  A regular expression that matches files and
                                   directories that should be excluded on
                                   recursive searches.  An empty value means no
   --exclude TEXT                  A regular expression that matches files and
                                   directories that should be excluded on
                                   recursive searches.  An empty value means no


@@ -100,16 +112,23 @@ Options:
                                   directories on all platforms (Windows, too).
                                   Exclusions are calculated first, inclusions
                                   later.  [default: /(\.eggs|\.git|\.hg|\.mypy
                                   directories on all platforms (Windows, too).
                                   Exclusions are calculated first, inclusions
                                   later.  [default: /(\.eggs|\.git|\.hg|\.mypy

-                                  _cache|\.nox|\.tox|\.venv|_build|buck-
+                                  _cache|\.nox|\.tox|\.venv|\.svn|_build|buck-

                                   out|build|dist)/]
                                   out|build|dist)/]

+
+  --force-exclude TEXT            Like --exclude, but files and directories
+                                  matching this regex will be excluded even
+                                  when they are passed explicitly as arguments
+

   -q, --quiet                     Don't emit non-error messages to stderr.
   -q, --quiet                     Don't emit non-error messages to stderr.

-                                  Errors are still emitted, silence those with
+                                  Errors are still emitted; silence those with

                                   2>/dev/null.
                                   2>/dev/null.

+

   -v, --verbose                   Also emit messages to stderr about files
                                   that were not changed or were ignored due to
                                   --exclude=.
   -v, --verbose                   Also emit messages to stderr about files
                                   that were not changed or were ignored due to
                                   --exclude=.

+

   --version                       Show the version and exit.
   --version                       Show the version and exit.

-  --config PATH                   Read configuration from PATH.
+  --config FILE                   Read configuration from PATH.

   -h, --help                      Show this message and exit.
 ```
 
   -h, --help                      Show this message and exit.
 ```