diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2582339dbc3..f4305ea83f1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,22 @@ +Version 2.3.6 +------------- + +:Date: April 05, 2018 + +* `@agjohnson `_: Drop readthedocs- prefix to submodule (`#3916 `_) +* `@agjohnson `_: This fixes two bugs apparent in nesting of translations in subprojects (`#3909 `_) +* `@humitos `_: Use new django celery beat scheduler (`#3908 `_) +* `@humitos `_: Use a proper default for `docker` attribute on UpdateDocsTask (`#3907 `_) +* `@davidfischer `_: Handle errors from publish_parts (`#3905 `_) +* `@agjohnson `_: Drop pdbpp from testing requirements (`#3904 `_) +* `@stsewd `_: Little improve on sync_versions (`#3902 `_) +* `@humitos `_: Save Docker image data in JSON file only for DockerBuildEnvironment (`#3897 `_) +* `@davidfischer `_: Single analytics file for all builders (`#3896 `_) +* `@humitos `_: Organize logging levels (`#3893 `_) +* `@agjohnson `_: Add ref links for easier intersphinx on yaml config page (`#3877 `_) +* `@stsewd `_: Pin astroid to fix linter issue on travis (`#3816 `_) +* `@davidfischer `_: Anonymize IP addresses for Google Analytics (`#3626 `_) + Version 2.3.5 ------------- diff --git a/setup.cfg b/setup.cfg index e7eed98999c..b5ab13256c6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = readthedocs -version = 2.3.5 +version = 2.3.6 license = MIT description = Read the Docs builds and hosts documentation author = Read the Docs, Inc @@ -24,3 +24,7 @@ packages = find: include_package_data = True zip_safe = False +[tool:release] +github_owner = rtfd +github_repo = readthedocs.org + diff --git a/tasks.py b/tasks.py deleted file mode 100644 index 7114f7beabf..00000000000 --- a/tasks.py +++ /dev/null @@ -1,103 +0,0 @@ -# -*- coding: utf-8 -*- -"""Read the Docs invoke tasks.""" - -from __future__ import division, print_function, unicode_literals - -import os -import textwrap - -from dateutil.parser import parse -from future.moves.configparser import RawConfigParser -from invoke import task, Exit - - -@task -def prepare(ctx, version, since=None): - """ - Prepare the next release version by updating files. - - This will stage a few updates for manual review and commit: - - * Prepend the most recent PRs and issues that were closed to CHANGELOG.rst. - * Update the setup.cfg version - - Changelog uses the file modification date to track the last time it was - updated. New entries will end up at the top of the file, under a heading - for the new version. - """ - # Ensure we're on the master branch first - git_rev_parse = ctx.run('git rev-parse --abbrev-ref HEAD', hide=True) - current_branch = git_rev_parse.stdout.strip() - if current_branch != 'master': - print('You must be on master branch!') - raise Exit(1) - - print('Updating release version in setup.cfg') - setupcfg_path = os.path.join(os.path.dirname(__file__), 'setup.cfg') - config = RawConfigParser() - config.read(setupcfg_path) - config.set('metadata', 'version', version) - with open(setupcfg_path, 'wb') as configfile: - config.write(configfile) - - print('Installing github-changelog') - 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') - template_path = os.path.join( - os.path.dirname(__file__), - 'contrib', - 'changelog.hbs', - ) - bin_path = os.path.join( - os.path.dirname(__file__), - 'node_modules', - '.bin', - ) - cmd = ( - '{bin_path}/gh-changelog ' - '-o rtfd -r readthedocs.org ' - '--file {changelog_path} ' - '--since {since} ' - '--template {template_path} ' - '--header "Version {version}" ' - '--merged' - ).format( - bin_path=bin_path, - version=version, - template_path=template_path, - changelog_path=changelog_path, - since=since, - ) # yapf: disable - try: - token = os.environ['GITHUB_TOKEN'] - cmd += '--token ' + token + ' ' - except KeyError: - print('') - print( - '\n'.join( - textwrap.wrap( - 'In order to avoid rate limiting on the GitHub API, you can specify ' - 'an environment variable `GITHUB_TOKEN` with a personal access token. ' - 'There is no need for the token to have any permissions unless the ' - 'repoistory is private.'))) - print('') - print('Updating changelog') - ctx.run(cmd) - - -@task -def release(ctx, version): - """ - Tag release of Read the Docs. - - Do this after prepare task and manual cleanup/commit - """ - ctx.run( - ('git tag {version} && ' - 'git push --tags').format(version=version)) diff --git a/tasks.py b/tasks.py new file mode 120000 index 00000000000..380bdfab380 --- /dev/null +++ b/tasks.py @@ -0,0 +1 @@ +common/tasks.py \ No newline at end of file