Skip to content

Commit

Permalink
Merge from 0.x: Release 0.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
dalthviz committed May 5, 2020
2 parents 0792bf2 + 16d8aca commit 087320c
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 4 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# History of changes

## Version 0.7.2 (2020-05-05)

### Pull Requests Merged

* [PR 145](https://github.com/spyder-ide/qtawesome/pull/145) - PR: Update release instructions for the 0.x branch, by [@ccordoba12](https://github.com/ccordoba12)
* [PR 143](https://github.com/spyder-ide/qtawesome/pull/143) - PR: Do not call python directly in tests, by [@scarabeusiv](https://github.com/scarabeusiv)

In this release 2 pull requests were closed.


----


## Version 0.7.1 (2020-04-15)

### Issues Closed
Expand Down
18 changes: 15 additions & 3 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,18 @@ To release a new version of qtawesome on PyPI:

* git clean -xfdi

* Update Changelog with `loghub spyder-ide/qtawesome -zr "qtawesome vX.X.X"`
* Update Changelog with

* Update _version.py (set release version, remove 'dev')
loghub spyder-ide/qtawesome -zr "qtawesome vX.X.X"

* Update `_version.py` (set release version, remove 'dev0')

* git add and git commit with "Release x.x.x"

* Update the most important release packages with

pip install -U pip setuptools twine wheel

* python setup.py sdist

* python setup.py bdist_wheel
Expand All @@ -20,10 +26,16 @@ To release a new version of qtawesome on PyPI:

* git tag -a vX.X.X -m 'Release x.x.x'

* Update _version.py (add 'dev0' and increment minor)
* Update `_version.py` (add 'dev0' and increment minor)

* git add and git commit with "Back to work"

* git checkout master

* git merge 0.x and git commit with "Merge from 0.x: Release x.x.x"

* git push upstream master

* git push upstream 0.x

* git push upstream --tags
3 changes: 2 additions & 1 deletion qtawesome/tests/test_qtawesome.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"""
# Standard library imports
import subprocess
import sys
import collections

# Test Library imports
Expand All @@ -14,7 +15,7 @@


def test_segfault_import():
output_number = subprocess.call('python -c "import qtawesome '
output_number = subprocess.call(sys.executable + ' -c "import qtawesome '
'; qtawesome.icon()"', shell=True)
assert output_number == 0

Expand Down

0 comments on commit 087320c

Please sign in to comment.