From ab17ad972c36ceb3d91ccae0bdabebadb040e324 Mon Sep 17 00:00:00 2001 From: Roald Nefs Date: Sun, 17 Jan 2021 10:19:17 +0100 Subject: [PATCH] Bump version to 0.5.0 (#229) * Bump version to 0.5.0 * Update the Read the Docs configuration Signed-off-by: Roald Nefs --- .readthedocs.yml | 2 +- docs/contributing.rst | 6 +++--- saltlint/__init__.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 698bbf9..eedce3a 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -6,4 +6,4 @@ formats: python: version: 3.7 install: - - docs/requirements.txt + - requirements: docs/requirements.txt diff --git a/docs/contributing.rst b/docs/contributing.rst index 62f6ff3..e9a937e 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -21,10 +21,10 @@ Please note we have a code of conduct, please follow it in all your interactions git remote add upstream https://github.com/warpnet/salt-lint.git -4. Create a new branch in your clone. Create your branch from the develop branch:: +4. Create a new branch in your clone. Create your branch from the main branch:: git fetch upstream - git checkout -b add-cool-feature upstream/develop + git checkout -b add-cool-feature upstream/main 5. Edit and commit changes to your branch:: @@ -52,7 +52,7 @@ Write a short, descriptive commit title and a longer commit message if necessary 7. Find the branch on your GitHub salt fork. -8. Open a new pull request. Click on `Pull Request` on the right near the top of you fork. Choose `develop` as the base branch. Review that the proposed changes are what you expect. Write a descriptive comment. Include links to related issues (e.g. 'Fixes #1.') in the comment field. Click `Create pull request`. +8. Open a new pull request. Click on `Pull Request` on the right near the top of you fork. Choose `main` as the base branch. Review that the proposed changes are what you expect. Write a descriptive comment. Include links to related issues (e.g. 'Fixes #1.') in the comment field. Click `Create pull request`. 9. Salt-lint project members will review your pull request and automated tests will run on it. diff --git a/saltlint/__init__.py b/saltlint/__init__.py index 0c41c14..c91d06c 100644 --- a/saltlint/__init__.py +++ b/saltlint/__init__.py @@ -5,7 +5,7 @@ """ NAME = 'salt-lint' -VERSION = '0.4.2' +VERSION = '0.5.0' DESCRIPTION = __doc__ __author__ = 'Warpnet B.V.'