- continued 1.4 setup, somehow the commit didn't work

Fixes: #4631
Change-Id: I400e388a704aa6ee7722a89687a033083ce22550

diff --git a/doc/build/conf.py b/doc/build/conf.py
index 58d32fa06e56a648f9db2aee6d6eb4a410547045..243f4b5870d7e339876c95e795f1950a5d659121 100644 (file)
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -107,11 +107,11 @@ copyright = u'2007-2019, the SQLAlchemy authors and contributors'
 # built documents.
 #
 # The short X.Y version.
-version = "1.3"
+version = "1.4"
 # The full version, including alpha/beta/rc tags.
-release = "1.3.3"
+release = "1.4.0b1"
 
-release_date = "April 15, 2019"
+release_date = None
 
 site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
 site_adapter_template = "docs_adapter.mako"

diff --git a/doc/build/core/tutorial.rst b/doc/build/core/tutorial.rst
index 04c74a63620e8cd6fe3d5ae0d863b31b0b9e2f36..cdacedadfe772503a821a327d60a856e7af31ccb 100644 (file)
--- a/doc/build/core/tutorial.rst
+++ b/doc/build/core/tutorial.rst
@@ -50,13 +50,13 @@ Version Check
 =============
 
 
-A quick check to verify that we are on at least **version 1.3** of SQLAlchemy:
+A quick check to verify that we are on at least **version 1.4** of SQLAlchemy:
 
 .. sourcecode:: pycon+sql
 
     >>> import sqlalchemy
     >>> sqlalchemy.__version__  # doctest: +SKIP
-    1.3.0
+    1.4.0
 
 Connecting
 ==========

diff --git a/doc/build/index.rst b/doc/build/index.rst
index ae9052c25901c6e8a7b5cdf29cab45e5bf9ded1d..9513c89941e5ba6c2f0e30a577591ddcf81f7b83 100644 (file)
--- a/doc/build/index.rst
+++ b/doc/build/index.rst
@@ -14,7 +14,7 @@ A high level view and getting set up.
 :doc:`Overview <intro>` |
 :ref:`Installation Guide <installation>` |
 :doc:`Frequently Asked Questions <faq/index>` |
-:doc:`Migration from 1.2 <changelog/migration_13>` |
+:doc:`Migration from 1.3 <changelog/migration_14>` |
 :doc:`Glossary <glossary>` |
 :doc:`Error Messages <errors>` |
 :doc:`Changelog catalog <changelog/index>`

diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index 4e81beee6ba0309d5d334514ba79813f790343bd..300831fe685a7712602fa6fe3720bf666fd071fa 100644 (file)
--- a/doc/build/intro.rst
+++ b/doc/build/intro.rst
@@ -107,7 +107,7 @@ downloaded from PyPI and installed in one step::
 This command will download the latest **released** version of SQLAlchemy from the `Python
 Cheese Shop <http://pypi.python.org/pypi/SQLAlchemy>`_ and install it to your system.
 
-In order to install the latest **prerelease** version, such as ``1.3.0b1``,
+In order to install the latest **prerelease** version, such as ``1.4.0b1``,
 pip requires that the ``--pre`` flag be used::
 
     pip install --pre SQLAlchemy
@@ -162,7 +162,7 @@ the available DBAPIs for each database, including external links.
 Checking the Installed SQLAlchemy Version
 ------------------------------------------
 
-This documentation covers SQLAlchemy version 1.3. If you're working on a
+This documentation covers SQLAlchemy version 1.4. If you're working on a
 system that already has SQLAlchemy installed, check the version from your
 Python prompt like this:
 
@@ -170,11 +170,11 @@ Python prompt like this:
 
      >>> import sqlalchemy
      >>> sqlalchemy.__version__ # doctest: +SKIP
-     1.3.0
+     1.4.0
 
 .. _migration:
 
-1.2 to 1.3 Migration
+1.3 to 1.4 Migration
 =====================
 
-Notes on what's changed from 1.2 to 1.3 is available here at :doc:`changelog/migration_13`.
+Notes on what's changed from 1.3 to 1.4 is available here at :doc:`changelog/migration_14`.

diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst
index 283125c823e33371401415a66922c16eb01e4576..21b70af089d639e0adb07fcfbbc462da64662504 100644 (file)
--- a/doc/build/orm/tutorial.rst
+++ b/doc/build/orm/tutorial.rst
@@ -40,11 +40,11 @@ following text represents the expected return value.
 Version Check
 =============
 
-A quick check to verify that we are on at least **version 1.3** of SQLAlchemy::
+A quick check to verify that we are on at least **version 1.4** of SQLAlchemy::
 
     >>> import sqlalchemy
     >>> sqlalchemy.__version__ # doctest:+SKIP
-    1.3.0
+    1.4.0
 
 Connecting
 ==========