Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
bbengfort committed Jul 6, 2016
1 parent 5b18bfd commit 27f7c82
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 20 deletions.
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,16 +103,18 @@ The image used in this README, [Answers][answers.jpg] by [Francisco Martins](htt

## Changelog

The release versions that are sent to the Python package index (PyPI) are also tagged in Github. You can see the tags through the Github web application and download the tarball of the version you'd like. Additionally PyPI will host the various releases of Trinket (eventually).
The release versions that are sent to the Python package index (PyPI) are also tagged in Github. You can see the tags through the Github web application and download the tarball of the version you'd like. Additionally PyPI will host the various releases of Minimum Entropy (eventually).

The versioning uses a three part version system, "a.b.c" - "a" represents a major release that may not be backwards compatible. "b" is incremented on minor releases that may contain extra features, but are backwards compatible. "c" releases are bug fixes or other micro changes that developers should feel free to immediately update to.


### Version 0.1
### Version 1.0 Beta 1

* **tag**: [v0.1](#)
* **deployment**: Pending
* **commit**: [pending](#)
* **tag**: [v1.0b1](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.0b1)
* **deployment**: Tuesday, July 5, 2016
* **commit**: [see tag](#)

This beta release for Version 1.0 simply moves the code over from Kyudo and modifies it to remove the research components and only present a question and answer system. Things are not perfect since the app was designed for a different research project. However, the core functionality - asking questions and answering them with Markdown, as well as up and down voting exists. This is a good start to beta to our faculty to see what they think!

<!-- References -->
[travis_img]: https://travis-ci.org/DistrictDataLabs/minimum-entropy.svg
Expand Down
10 changes: 5 additions & 5 deletions docs/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ The release versions that are sent to the Python package index (PyPI) are also t

The versioning uses a three part version system, "a.b.c" - "a" represents a major release that may not be backwards compatible. "b" is incremented on minor releases that may contain extra features, but are backwards compatible. "c" releases are bug fixes or other micro changes that developers should feel free to immediately update to.

### Version 0.1
### Version 1.0 Beta 1

* **tag**: [v0.1](#)
* **deployment**: When?
* **commit**: (see tag)
* **tag**: [v1.0b1](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.0b1)
* **deployment**: Tuesday, July 5, 2016
* **commit**: [see tag](#)

What is it?
This beta release for Version 1.0 simply moves the code over from Kyudo and modifies it to remove the research components and only present a question and answer system. Things are not perfect since the app was designed for a different research project. However, the core functionality - asking questions and answering them with Markdown, as well as up and down voting exists. This is a good start to beta to our faculty to see what they think!
2 changes: 1 addition & 1 deletion minent/tests/test_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
## Module variables
##########################################################################

EXPECTED_VERSION = "0.1"
EXPECTED_VERSION = "1.0b1"

##########################################################################
## Initialization Tests
Expand Down
27 changes: 18 additions & 9 deletions minent/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,32 @@
##########################################################################

__version_info__ = {
'major': 0,
'minor': 1,
'major': 1,
'minor': 0,
'micro': 0,
'releaselevel': 'final',
'serial': 0,
'releaselevel': 'beta',
'serial': 1,
}


def get_version(short=False):
"""
Returns the version from the version info.
"""
assert __version_info__['releaselevel'] in ('alpha', 'beta', 'final')
vers = ["%(major)i.%(minor)i" % __version_info__, ]
if __version_info__['releaselevel'] not in ('alpha', 'beta', 'final'):
raise ValueError(
"unknown release level '{}', select alpha, beta, or final.".format(
__version_info__['releaselevel']
)
)

vers = ["{major}.{minor}".format(**__version_info__)]

if __version_info__['micro']:
vers.append(".%(micro)i" % __version_info__)
vers.append(".{micro}".format(**__version_info__))

if __version_info__['releaselevel'] != 'final' and not short:
vers.append('%s%i' % (__version_info__['releaselevel'][0],
__version_info__['serial']))
vers.append('{}{}'.format(__version_info__['releaselevel'][0],
__version_info__['serial']))

return ''.join(vers)

0 comments on commit 27f7c82

Please sign in to comment.