Rename cirq-dev to cirq-unstable

- Refactor verify-published-package to have an --unstable flag.
- Refactor verify-published-package to require --prod/--test/--unstable be specified
- Rename various CIRQ_DEV type things to CIRQ_UNSTABLE type things

Fixes #2431

Author: Strilanc

.travis.yml

@@ -114,14 +114,14 @@ matrix:
     os: linux
     env: NAME=dev-release
     python: '3.7'
-    script: export CIRQ_DEV_VERSION=$(dev_tools/packaging/generate-dev-version-id.sh)
+    script: export CIRQ_UNSTABLE_VERSION=$(dev_tools/packaging/generate-dev-version-id.sh)
 before_deploy:
-- echo "Deploying dev version '$CIRQ_DEV_VERSION'"
+- echo "Deploying dev version '$CIRQ_UNSTABLE_VERSION'"
 deploy:
 - provider: pypi
   user: quantumlibdev
   on:
-    condition: '"$CIRQ_DEV_VERSION" == *dev*'
+    condition: '"$CIRQ_UNSTABLE_VERSION" == *dev*'
   distributions: bdist_wheel
   password:
     secure: KO3RuwLvjb5/J7akv2v/a9tEIbmErp7El6S+ZfMvDRlx8qpUfav1w4nvSGw6sfn837++2+F2Tb22wbJkjefpFMzg9mOdhFGwtOpiHSOnYlY2mnxVN9XdQnMS7F+8IMFas4J3EhqrlsZxoqyMy122S3pjtE/d6YSG+3YzmCu3rLsFl4EV6I5U8MgWJY8LDFqMIxuxgmEkJfPe5z9Sqqwtneelj39jobg4q1uZc0JD3rkI0hj/uhBvBoTTLQjPiZk3ZIkgkMmPVB8tDGK9eXqVuDK7U1ZoDWvTKNebZ94g46YuKVNY6tEJpgpacti6mMalva6wX8zYpWOrY0PPo34e5d/kfwkttnrMk+sPXJnvn5eM7tEWxF+PHz4ejcLEYpehgdbWksHaUVdPog7UrYXnertHDY42ukxF17JlU9rlf60IXJVmeYHTfB1p8V7Yfllgmfa49yGDnR68Y3iIR9NtT26ZoJnMAkrxvlTgz6poBbTKj+Gyr0pkTHLzniEo3D/C8xeVcD30yZPlXxCojcM4s2dM2h5IiQU//ubptP/TE0idG2AJiooEfGUsXZ+IbN4Zxvkoa4YzYCvYFlr42ZBnv0H5/xZc4uFK6rLcVtysZqWAj3QjVGIUX3G1sxy8ik+RSQun1Dhzov8v5RVtb6aShDWT6l6paAAEwrQNt0T44yo=

dev_tools/packaging/publish-dev-package.sh

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 ################################################################################
-# Produces and uploads dev-version wheels to a pypi package repository cirq-dev
+# Produces and uploads dev-version wheels to a pypi package 'cirq-unstable'
 # Note that this is not the dev-version for cirq, whose use is deprecated.
 #
 # Uploads to the test pypi repository unless the --prod switch is added.
@@ -112,8 +112,8 @@ cd "$(git rev-parse --show-toplevel)"
 tmp_package_dir=$(mktemp -d "/tmp/publish-dev-package_package.XXXXXXXXXXXXXXXX")
 trap "{ rm -rf ${tmp_package_dir}; }" EXIT
 
-# Configure to push to cirq-dev and not cirq.
-export CIRQ_DEV_VERSION=$(dev_tools/packaging/generate-dev-version-id.sh)
+# Configure to push to cirq-unstable and not cirq.
+export CIRQ_UNSTABLE_VERSION=$(dev_tools/packaging/generate-dev-version-id.sh)
 
 # Produce packages.
 dev_tools/packaging/produce-package.sh "${tmp_package_dir}" "${UPLOAD_VERSION}"

dev_tools/packaging/verify-published-package.sh

@@ -15,24 +15,26 @@
 # limitations under the License.
 
 ################################################################################
-# Downloads and tests cirq-dev wheels from the pypi package repository. Uses the
-# prod pypi repository unless the --test switch is added.
+# Downloads and tests cirq wheels from the pypi package repository.
+# Can verify prod, test, or unstable versions.
+#   --unstable: cirq-unstable from prod pypi
+#   --test: cirq from test pypi
+#   --prod: cirq from prod pypi
 #
 # CAUTION: when targeting the test pypi repository, this script assumes that the
 # local version of cirq has the same dependencies as the remote one (because the
 # dependencies must be installed from the non-test pypi repository). If the
 # dependencies disagree, the tests can spuriously fail.
 #
 # Usage:
-#     dev_tools/packaging/verify-published-package.sh PACKAGE_VERSION [--test|--prod]
+#     dev_tools/packaging/verify-published-package.sh PACKAGE_VERSION --test|--prod|--unstable
 ################################################################################
 
 set -e
 trap "{ echo -e '\033[31mFAILED\033[0m'; }" ERR
 
 
 PROJECT_NAME=cirq
-PROJECT_NAME_DEV=cirq-dev
 PROJECT_VERSION=$1
 PROD_SWITCH=$2
 
@@ -44,11 +46,17 @@ fi
 if [ "${PROD_SWITCH}" = "--test" ]; then
     PYPI_REPOSITORY_FLAG="--index-url=https://test.pypi.org/simple/"
     PYPI_REPO_NAME="TEST"
-elif [ -z "${PROD_SWITCH}" ] || [ "${PROD_SWITCH}" = "--prod" ]; then
+    PYPI_PROJECT_NAME="cirq"
+elif [ "${PROD_SWITCH}" = "--prod" ]; then
     PYPI_REPOSITORY_FLAG=''
     PYPI_REPO_NAME="PROD"
+    PYPI_PROJECT_NAME="cirq"
+elif [ "${PROD_SWITCH}" = "--unstable" ]; then
+    PYPI_REPOSITORY_FLAG=''
+    PYPI_REPO_NAME="PROD"
+    PYPI_PROJECT_NAME="cirq-unstable"
 else
-    echo -e "\033[31mSecond argument must be empty, '--prod' or '--test'.\033[0m"
+    echo -e "\033[31mSecond argument must be '--prod' or '--test' or '--unstable'.\033[0m"
     exit 1
 fi
 
@@ -76,8 +84,8 @@ for PYTHON_VERSION in python3; do
         echo "Pre-installing dependencies since they don't all exist in TEST pypi"
         "${tmp_dir}/${PYTHON_VERSION}/bin/pip" install --quiet -r "${RUNTIME_DEPS_FILE}"
     fi
-    echo Installing "${PROJECT_NAME_DEV}==${PROJECT_VERSION} from ${PYPI_REPO_NAME} pypi"
-    "${tmp_dir}/${PYTHON_VERSION}/bin/pip" install --quiet ${PYPI_REPOSITORY_FLAG} "${PROJECT_NAME_DEV}==${PROJECT_VERSION}"
+    echo Installing "${PYPI_PROJECT_NAME}==${PROJECT_VERSION} from ${PYPI_REPO_NAME} pypi"
+    "${tmp_dir}/${PYTHON_VERSION}/bin/pip" install --quiet ${PYPI_REPOSITORY_FLAG} "${PYPI_PROJECT_NAME}==${PROJECT_VERSION}"
 
     # Check that code runs without dev deps.
     echo Checking that code executes

setup.py

@@ -28,11 +28,11 @@
 # README file as long_description.
 long_description = io.open('README.rst', encoding='utf-8').read()
 
-# If CIRQ_DEV_VERSION is set then we use cirq-dev as the name of the package
+# If CIRQ_UNSTABLE_VERSION is set then we use cirq-unstable as the name of the package
 # and update the version to this value.
-if 'CIRQ_DEV_VERSION' in os.environ:
-    name = 'cirq-dev'
-    __version__ = os.environ['CIRQ_DEV_VERSION']
+if 'CIRQ_UNSTABLE_VERSION' in os.environ:
+    name = 'cirq-unstable'
+    __version__ = os.environ['CIRQ_UNSTABLE_VERSION']
     long_description = (
         "**This is a development version of Cirq and may be "
         "unstable.**\n\n**For the latest stable release of Cirq "