Release v2.0rc1

Author: Fizzadar

CHANGELOG.md

@@ -1,4 +1,4 @@
-# v2.0.dev1
+# v2.0rc1
 
 The first `2.x` release! Like v0 -> v1 this release mostly removes legacy APIs and methods which show warnings in v1. Major changes:
 

docs/index.rst

@@ -6,7 +6,7 @@
 pyinfra Documentation
 =========================
 
-Welcome to the ``pyinfra`` v1 documentation. If you're new to ``pyinfra`` you should start with the :doc:`getting started <./getting_started>` page.
+Welcome to the ``pyinfra`` v2 documentation. If you're new to ``pyinfra`` you should start with the :doc:`getting started <./getting_started>` page.
 
 
 Using pyinfra

scripts/release.sh

@@ -5,29 +5,14 @@ set -euo pipefail
 VERSION=`python setup.py --version`
 MAJOR_BRANCH="`python setup.py --version | cut -d'.' -f1`.x"
 
-IS_DEV=false
-if [[ `python setup.py --version` =~ "dev" ]]; then
-    IS_DEV=true
-fi
-
-echo "# Releasing pyinfra v${VERSION} (branch ${MAJOR_BRANCH}, dev=${IS_DEV})"
+echo "# Releasing pyinfra v${VERSION} (branch ${MAJOR_BRANCH})"
 
 echo "# Running tests..."
 pytest
 
-if [[ "${IS_DEV}" == "false" ]]; then
-    echo "# Git tag & push..."
-    git tag -a "v$VERSION" -m "v$VERSION"
-    git push --tags
-
-    echo "Git update major branch..."
-    git checkout $MAJOR_BRANCH
-    git merge current
-    git push
-    git checkout current
-else
-    echo "Skipping major branch due to dev release"
-fi
+echo "# Git tag & push..."
+git tag -a "v$VERSION" -m "v$VERSION"
+git push --tags
 
 echo "Clear existing build/dist..."
 rm -rf build/* dist/*

setup.py

@@ -73,7 +73,7 @@
 
 def get_version_from_changelog():
     # Regex matching pattern followed by 3 numerical values separated by '.'
-    pattern = re.compile(r'^# v(?P<version>[0-9]+\.[0-9]+(\.[0-9]+)?(\.[a-z0-9]+)?)$')
+    pattern = re.compile(r'^# v(?P<version>[0-9]+\.[0-9]+(\.[0-9]+)?(\.?[a-z0-9]+)?)$')
 
     with open('CHANGELOG.md', 'r') as fn:
         for line in fn.readlines():