Skip to content

Commit

Permalink
PyPI now supports Markdown, we no longer nead to convert it
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilippWendler committed May 21, 2019
1 parent 87fd858 commit 2e5e7fa
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 16 deletions.
4 changes: 1 addition & 3 deletions doc/DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ by passing the parameter `--system-site-packages` to `virtualenv`.

## Releasing a new Version

* Make sure to install `pandoc`, otherwise the documentation cannot be
converted to the correct format that PyPI needs.
You also need `twine`.
* You need `twine>=1.11.0` to be installed.

* Define next version number, e.g., from `1.1-dev` to `1.1`.
Add an according entry to `CHANGELOG.md` and commit.
Expand Down
10 changes: 3 additions & 7 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,8 @@ if [ -z "$DEBEMAIL" ]; then
echo "Please define environment variable DEBEMAIL with your name you want to use for the Debian package."
exit 1
fi
if ! which pandoc > /dev/null; then
echo 'Please install pandoc, e.g. with "sudo apt-get install pandoc".'
exit 1
fi
if ! which twine > /dev/null; then
echo 'Please install twine, e.g. with "pip3 install --user twine".'
echo 'Please install twine>=1.11.0, e.g. with "pipx install twine" or "pip3 install --user twine".'
exit 1
fi

Expand All @@ -65,7 +61,7 @@ virtualenv -p /usr/bin/python3 --system-site-packages "$TEMP3"
git clone "file://$DIR" "$TEMP3/benchexec"
pushd "$TEMP3/benchexec"
pip install -e "."
pip install pypandoc
pip install 'wheel>=0.31.0' 'setuptools>=38.6.0'
python setup.py nosetests
python setup.py sdist bdist_egg bdist_wheel
popd
Expand All @@ -80,7 +76,7 @@ virtualenv -p /usr/bin/python2 "$TEMP2"
git clone "file://$DIR" "$TEMP2/benchexec"
pushd "$TEMP2/benchexec"
pip install -e "."
pip install pypandoc
pip install 'setuptools>=38.6.0'
python setup.py test
python setup.py bdist_egg
popd
Expand Down
9 changes: 3 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,8 @@

# Get the long description from the relevant file
readme = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'README.md')
try:
import pypandoc
long_description = pypandoc.convert(readme, 'rst', format='markdown_github-hard_line_breaks')
except (IOError, ImportError):
with open(readme, 'rb') as f:
long_description = f.read().decode('utf-8')
with open(readme, 'rb') as f:
long_description = f.read().decode('utf-8')

PY2 = sys.version_info[0] == 2

Expand All @@ -55,6 +51,7 @@
author = 'Dirk Beyer',
description = ('A Framework for Reliable Benchmarking and Resource Measurement.'),
long_description = long_description,
long_description_content_type = "text/markdown",
url = 'https://github.com/sosy-lab/benchexec/',
license = 'Apache 2.0 License',
keywords = 'benchmarking resource measurement',
Expand Down

0 comments on commit 2e5e7fa

Please sign in to comment.