浏览代码

Convert the README to rst and fix the logo url before packaging it up for pypi.

Signed-off-by: Daniel Nephin <[email protected]>
Daniel Nephin 10 年之前
父节点
当前提交
bbc76e6034
共有 3 个文件被更改,包括 14 次插入4 次删除
  1. 1 0
      .gitignore
  2. 2 0
      MANIFEST.in
  3. 11 4
      script/release/push-release

+ 1 - 0
.gitignore

@@ -7,3 +7,4 @@
 /dist
 /docs/_site
 /venv
+README.rst

+ 2 - 0
MANIFEST.in

@@ -4,6 +4,8 @@ include requirements.txt
 include requirements-dev.txt
 include tox.ini
 include *.md
+exclude README.md
+include README.rst
 include compose/config/*.json
 recursive-include contrib/completion *
 recursive-include tests *

+ 11 - 4
script/release/push-release

@@ -21,11 +21,17 @@ VERSION="$(git config "branch.${BRANCH}.release")" || usage
 
 if [ -z "$(command -v jq 2> /dev/null)" ]; then
     >&2 echo "$0 requires https://stedolan.github.io/jq/"
-    >&2 echo "Please install it and ake sure it is available on your \$PATH."
+    >&2 echo "Please install it and make sure it is available on your \$PATH."
     exit 2
 fi
 
 
+if [ -z "$(command -v pandoc 2> /dev/null)" ]; then
+    >&2 echo "$0 requires http://pandoc.org/"
+    >&2 echo "Please install it and make sure it is available on your \$PATH."
+    exit 2
+fi
+
 API=https://api.github.com/repos
 REPO=docker/compose
 [email protected]:$REPO
@@ -45,12 +51,13 @@ echo "Tagging the release as $VERSION"
 git tag $VERSION
 git push $GITHUB_REPO $VERSION
 
-echo "Uploading sdist to pypi"
-python setup.py sdist
-
 echo "Uploading the docker image"
 docker push docker/compose:$VERSION
 
+echo "Uploading sdist to pypi"
+pandoc -f markdown -t rst README.md -o README.rst
+sed -i -e 's/logo.png?raw=true/https:\/\/github.com\/docker\/compose\/raw\/master\/logo.png?raw=true/' README.rst
+python setup.py sdist
 if [ "$(command -v twine 2> /dev/null)" ]; then
     twine upload ./dist/docker-compose-${VERSION}.tar.gz
 else