Merge branch 'master' into v0.11.0-dev

Author: balopat

dev_tools/packaging/produce-package.sh

@@ -25,8 +25,6 @@
 #     dev_tools/packaging/produce-package.sh output_dir [version]
 ################################################################################
 
-PROJECT_NAME=cirq-core/cirq
-
 set -e
 trap "{ echo -e '\033[31mFAILED\033[0m'; }" ERR
 
@@ -54,7 +52,9 @@ git init --quiet
 git fetch "${repo_dir}" HEAD --quiet --depth=1
 git checkout FETCH_HEAD -b work --quiet
 if [ ! -z "${SPECIFIED_VERSION}" ]; then
-    echo '__version__ = "'"${SPECIFIED_VERSION}"'"' > "${tmp_git_dir}/${PROJECT_NAME}/_version.py"
+    for PROJECT_NAME in cirq-core/cirq cirq-google/cirq_google; do
+      echo '__version__ = "'"${SPECIFIED_VERSION}"'"' > "${tmp_git_dir}/${PROJECT_NAME}/_version.py"
+    done
 fi
 
 # Python 3 wheel.

release.md

@@ -37,8 +37,9 @@ to the next minor version.  This can always be found in the
 
 ## Before you release: flush the deprecation backlog
 
-Ensure that all the deprecations that were meant to be deprecated for the given release. 
-E.g. if you want to release `v0.11`, you can check with `git grep 'v0.11'` for all the lines containing this deadline.  
+Ensure that all the deprecations are removed that were meant to be deprecated for the given release. 
+E.g. if you want to release `v0.11`, you can check with `git grep 'v0.11'` for all the lines containing this deadline.
+Make sure none of those are released.  
 
 ## Release Procedure
 
@@ -133,8 +134,8 @@ that will go to pypi.
 
 ```bash
 git checkout "v${VER}-dev"
-python3 setup.py -q bdist_wheel
-ls dist  # should only contain ONE file
+./dev_tools/packaging/produce-package.sh dist
+ls dist  # should only contain 3 files, one versioned whl file for cirq, cirq_google and cirq_core 
 ```
 
 ### Push to test pypi