Skip to content
This repository has been archived by the owner on Nov 23, 2020. It is now read-only.

Commit

Permalink
updated version
Browse files Browse the repository at this point in the history
  • Loading branch information
lsbardel committed Apr 13, 2015
1 parent 2d45b64 commit ec890ff
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 79 deletions.
2 changes: 1 addition & 1 deletion pulsar/__init__.py
Expand Up @@ -4,7 +4,7 @@

from .utils.version import get_version

VERSION = (3, 4, 0, 'beta', 1)
VERSION = (1, 4, 0, 'alpha', 0)

__version__ = version = get_version(VERSION)
__license__ = "BSD"
Expand Down
154 changes: 77 additions & 77 deletions pulsar/utils/version.py
@@ -1,77 +1,77 @@
import datetime
import os
import subprocess


def get_version(version):
assert len(version) == 5
assert version[3] in ('alpha', 'beta', 'rc', 'final')
main = '.'.join(map(str, version[:3]))
sub = ''
if version[3] == 'alpha' and version[4] == 0:
git_changeset = get_git_changeset()
if git_changeset:
sub = '-dev.%s' % git_changeset
elif version[3] != 'final':
sub = '-%s.%s' % tuple(version[3:])
return main + sub


def sh(command, cwd=None):
return subprocess.Popen(command,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
shell=True,
cwd=cwd,
universal_newlines=True).communicate()[0]


def get_git_changeset():
"""Returns a numeric identifier of the latest git changeset.
The result is the UTC timestamp of the changeset in YYYYMMDDHHMMSS format.
This value isn't guaranteed to be unique, but collisions are very unlikely,
so it's sufficient for generating the development version numbers.
"""
repo_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
git_show = sh('git show --pretty=format:%ct --quiet HEAD',
cwd=repo_dir)
timestamp = git_show.partition('\n')[0]
try:
timestamp = datetime.datetime.utcfromtimestamp(int(timestamp))
except ValueError:
return None
return timestamp.strftime('%Y%m%d%H%M%S')


FORMAT = '%n'.join(['%H', '%aN', '%ae', '%cN', '%ce', '%s'])


def gitrepo(root=None):
if not root:
cwd = root = os.getcwd()
else:
cwd = os.getcwd()
if cwd != root:
os.chdir(root)
gitlog = sh('git --no-pager log -1 --pretty="format:%s"' % FORMAT,
cwd=root).split('\n', 5)
branch = sh('git rev-parse --abbrev-ref HEAD', cwd=root).strip()
remotes = [x.split() for x in
filter(lambda x: x.endswith('(fetch)'),
sh('git remote -v', cwd=root).strip().splitlines())]
if cwd != root:
os.chdir(cwd)
return {
"head": {
"id": gitlog[0],
"author_name": gitlog[1],
"author_email": gitlog[2],
"committer_name": gitlog[3],
"committer_email": gitlog[4],
"message": gitlog[5].strip(),
},
"branch": branch,
"remotes": [{'name': remote[0], 'url': remote[1]}
for remote in remotes]
}
import datetime
import os
import subprocess


def get_version(version):
assert len(version) == 5
assert version[3] in ('alpha', 'beta', 'rc', 'final')
main = '.'.join(map(str, version[:3]))
sub = ''
if version[3] == 'alpha' and version[4] == 0:
git_changeset = get_git_changeset()
if git_changeset:
sub = '-dev.%s' % git_changeset
elif version[3] != 'final':
sub = '%s%s' % tuple(version[3:])
return main + sub


def sh(command, cwd=None):
return subprocess.Popen(command,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
shell=True,
cwd=cwd,
universal_newlines=True).communicate()[0]


def get_git_changeset():
"""Returns a numeric identifier of the latest git changeset.
The result is the UTC timestamp of the changeset in YYYYMMDDHHMMSS format.
This value isn't guaranteed to be unique, but collisions are very unlikely,
so it's sufficient for generating the development version numbers.
"""
repo_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
git_show = sh('git show --pretty=format:%ct --quiet HEAD',
cwd=repo_dir)
timestamp = git_show.partition('\n')[0]
try:
timestamp = datetime.datetime.utcfromtimestamp(int(timestamp))
except ValueError:
return None
return timestamp.strftime('%Y%m%d%H%M%S')


FORMAT = '%n'.join(['%H', '%aN', '%ae', '%cN', '%ce', '%s'])


def gitrepo(root=None):
if not root:
cwd = root = os.getcwd()
else:
cwd = os.getcwd()
if cwd != root:
os.chdir(root)
gitlog = sh('git --no-pager log -1 --pretty="format:%s"' % FORMAT,
cwd=root).split('\n', 5)
branch = sh('git rev-parse --abbrev-ref HEAD', cwd=root).strip()
remotes = [x.split() for x in
filter(lambda x: x.endswith('(fetch)'),
sh('git remote -v', cwd=root).strip().splitlines())]
if cwd != root:
os.chdir(cwd)
return {
"head": {
"id": gitlog[0],
"author_name": gitlog[1],
"author_email": gitlog[2],
"committer_name": gitlog[3],
"committer_email": gitlog[4],
"message": gitlog[5].strip(),
},
"branch": branch,
"remotes": [{'name': remote[0], 'url': remote[1]}
for remote in remotes]
}
2 changes: 1 addition & 1 deletion tests/wsgi/wsgi.py
Expand Up @@ -152,7 +152,7 @@ def test_httponly_cookie(self):
example_cookie = response.cookies['example']
# A compat cookie may be in use -- check that it has worked
# both as an output string, and using the cookie attributes
self.assertTrue('; httponly' in str(example_cookie))
self.assertTrue('; httponly' in str(example_cookie).lower())
self.assertTrue(example_cookie['httponly'])

def test_headers(self):
Expand Down

0 comments on commit ec890ff

Please sign in to comment.