Release 2.3.4

CHANGELOG.rst

@@ -1,9 +1,27 @@
-Version 2.3.3
+.. _version-2.3.4:
+
+Version 2.3.4
 -------------
 
-TBD
+* Release for static assets
+
+Version 2.3.3
+-------------
 
-.. _version-2.3.2:
+* `@davidfischer <http://github.com/davidfischer>`_: Fix linting errors in tests (`#3855 <https://github.com/rtfd/readthedocs.org/pull/3855>`_)
+* `@humitos <http://github.com/humitos>`_: Fix linting issues (`#3838 <https://github.com/rtfd/readthedocs.org/pull/3838>`_)
+* `@humitos <http://github.com/humitos>`_: Update instance and model when `record_as_success` (`#3831 <https://github.com/rtfd/readthedocs.org/pull/3831>`_)
+* `@ericholscher <http://github.com/ericholscher>`_: Reorder GSOC projects, and note priority order (`#3823 <https://github.com/rtfd/readthedocs.org/pull/3823>`_)
+* `@agjohnson <http://github.com/agjohnson>`_: Add temporary method for skipping submodule checkout (`#3821 <https://github.com/rtfd/readthedocs.org/pull/3821>`_)
+* `@davidfischer <http://github.com/davidfischer>`_: Remove pinned CSS Select version (`#3813 <https://github.com/rtfd/readthedocs.org/pull/3813>`_)
+* `@humitos <http://github.com/humitos>`_: Use readthedocs-common to share linting files accross different repos (`#3808 <https://github.com/rtfd/readthedocs.org/pull/3808>`_)
+* `@davidfischer <http://github.com/davidfischer>`_: Use JSONP for sustainability API (`#3789 <https://github.com/rtfd/readthedocs.org/pull/3789>`_)
+* `@humitos <http://github.com/humitos>`_: Define useful celery beat task for development (`#3762 <https://github.com/rtfd/readthedocs.org/pull/3762>`_)
+* `@humitos <http://github.com/humitos>`_: Auto-generate conf.py compatible with Py2 and Py3 (`#3745 <https://github.com/rtfd/readthedocs.org/pull/3745>`_)
+* `@humitos <http://github.com/humitos>`_: Task to remove orphan symlinks (`#3543 <https://github.com/rtfd/readthedocs.org/pull/3543>`_)
+* `@stsewd <http://github.com/stsewd>`_: Fix regex for public bitbucket repo (`#3533 <https://github.com/rtfd/readthedocs.org/pull/3533>`_)
+* `@humitos <http://github.com/humitos>`_: Documentation for RTD context sent to the Sphinx theme (`#3490 <https://github.com/rtfd/readthedocs.org/pull/3490>`_)
+* `@stsewd <http://github.com/stsewd>`_: Show link to docs on a build (`#3446 <https://github.com/rtfd/readthedocs.org/pull/3446>`_)
 
 Version 2.3.2
 -------------

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = readthedocs
-version = 2.3.3
+version = 2.3.4
 license = MIT
 description = Read the Docs builds and hosts documentation
 author = Read the Docs, Inc

tasks.py

@@ -12,7 +12,7 @@
 
 
 @task
-def prepare(ctx, version):
+def prepare(ctx, version, since):
     """
     Prepare the next release version by updating files.
 
@@ -41,10 +41,11 @@ def prepare(ctx, version):
         config.write(configfile)
 
     print('Installing github-changelog')
-    # Get last modified date from Git instead of assuming the file metadata is
-    # correct. This can change depending on git reset, etc.
-    git_log = ctx.run('git log -1 --format="%ad" -- CHANGELOG.rst')
-    last_modified = parse(git_log.stdout.strip()).strftime('%Y-%m-%d')
+    if not since:
+        # Get last modified date from Git instead of assuming the file metadata is
+        # correct. This can change depending on git reset, etc.
+        git_log = ctx.run('git log -1 --format="%ad" -- CHANGELOG.rst')
+        since = parse(git_log.stdout.strip()).strftime('%Y-%m-%d')
     # Install and run
     ctx.run('npm install git+https://github.com/agjohnson/github-changelog.git')
     changelog_path = os.path.join(os.path.dirname(__file__), 'CHANGELOG.rst')
@@ -62,15 +63,16 @@ def prepare(ctx, version):
         '{bin_path}/gh-changelog '
         '-o rtfd -r readthedocs.org '
         '--file {changelog_path} '
-        '--since {last_modified} '
+        '--since {since} '
         '--template {template_path} '
-        '--header "Version {version}"'
+        '--header "Version {version}" '
+        '--merged'
     ).format(
         bin_path=bin_path,
         version=version,
         template_path=template_path,
         changelog_path=changelog_path,
-        last_modified=last_modified,
+        since=since,
     )  # yapf: disable
     try:
         token = os.environ['GITHUB_TOKEN']