diff --git a/README.rst b/README.rst index bca8a8877313..becc00e60669 100644 --- a/README.rst +++ b/README.rst @@ -16,7 +16,7 @@ You can run Warehouse locally using ``docker`` and ``docker-compose``. See `Getting started `__ in the documentation for instructions on how to set it up. -You can try a pre-production deployment of Warehouse at `pypi.org`_. +You can try a beta deployment of Warehouse at `pypi.org`_. Discussion ---------- diff --git a/docs/api-reference/integration-guide.rst b/docs/api-reference/integration-guide.rst index 177c222f2322..fb3c72f838de 100644 --- a/docs/api-reference/integration-guide.rst +++ b/docs/api-reference/integration-guide.rst @@ -14,7 +14,10 @@ Migrating to the new PyPI ------------------------- If your site/service used to link or upload to pypi.python.org, you -should start using pypi.org instead. +should prepare to start using pypi.org instead. Subscribe to `the PyPI +announcement list (low-traffic) +`_ +to find out when you should switch permanently. Here are some tips. @@ -45,7 +48,10 @@ Here are some tips. * JSON API: ``https://pypi.org/pypi/{name}/json`` returns the expected JSON response directly. See :doc:`json`. -* XML-RPC API: see :ref:`changes-to-legacy-api`. +* XML-RPC API: see :ref:`changes-to-legacy-api`. Will be deprecated in + the future; switch to the RSS or JSON APIs. If you depend on an + XML-RPC call that our other APIs do not support, please tell us. * Packages/updates RSS feeds: ``https://pypi.org/pypi?%3Aaction=rss`` redirects to ``https://pypi.org/rss/updates.xml``, and diff --git a/docs/index.rst b/docs/index.rst index 3310c9af383f..cdc6394e105b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -15,8 +15,8 @@ Contents: Warehouse is a new code base that implements a `Python package index (repository)`_. It is being `actively developed`_ and will eventually power PyPI_ and replace an older code base that is currently powering -PyPI. You can see Warehouse in production at https://pypi.org/ and -you can read the `Warehouse roadmap`_. +PyPI. You can see a beta version of Warehouse at https://pypi.org/ +and you can read the `Warehouse roadmap`_. The goal is to improve PyPI by making it: diff --git a/warehouse/templates/pages/help.html b/warehouse/templates/pages/help.html index 5e8c9cae4fa6..16ad33b898ca 100644 --- a/warehouse/templates/pages/help.html +++ b/warehouse/templates/pages/help.html @@ -41,7 +41,7 @@ {% macro maintainers() %}Who maintains PyPI?{% endmacro %} {% macro sponsors() %}What powers PyPI?{% endmacro %} {% macro availability() %}Can I depend on PyPI being available?{% endmacro %} -{% macro preproduction() %}What does pre-production mean?{% endmacro %} +{% macro beta() %}What does beta mean?{% endmacro %} {% macro contributing() %}How can I contribute to PyPI?{% endmacro %} {% block title %}Help{% endblock %} @@ -92,7 +92,7 @@

About

  • {{ maintainers() }}
  • {{ sponsors() }}
  • {{ availability() }}
    • -
  • {{ preproduction() }}
    • +
  • {{ beta() }}
  • {{ contributing() }}
    • @@ -293,23 +293,24 @@

    {{ availability() }}

    PyPI is heavily cached and distributed via CDN thanks to our sponsor Fastly and thus is generally available globally. However, as could be expected for a giant distributed system, things can and sometimes do go wrong. If you have high availability requirements for your package index, consider either a mirror or a private index.

    -

    {{ preproduction() }}

    +

    {{ beta() }}

    - 'Pre-production' indicates that you are using a version of this software that is not fully tested and 'production ready'. This means: + 'Beta' indicates you are using a version of PyPI that is robust, but not fully tested and 'production ready'. This means:

    - While we are in pre-production, our infrastructure cannot yet support all of the traffic generated by our users running pip install. We therefore ask that you do not use this version of PyPI for production codebases. + While we are in beta, the pypi.org infrastructure cannot yet support all of the API traffic generated by our users running pip install, so don't explicitly point to it in automated production setups. But we want you to try it and test it, and we're occasionally redirecting portions of that traffic in load tests we announce on our status page.

    - On the other hand, uploads are working well, and project maintainers and owners should use this version of PyPI over the legacy site, which no longer supports this function. + Uploads, search, and release management are working well, and project maintainers and owners should use this version of PyPI over the legacy site, which no longer supports uploading releases.

    - Please see our development roadmap to understand what features will be available next. + Please see our development roadmap to understand what features will be available next, and the beta announcement for more context on the beta. To learn when the site launches (goes from beta to production), subscribe to the announcement email list.

    {{ contributing() }}