Add some ignores and sync up version stuff with moniker

This commit is contained in:
Endre Karlson 2012-11-02 08:52:05 +01:00
parent bec210c9be
commit cbb8835ca6
3 changed files with 27 additions and 4 deletions

4
.gitignore vendored
View File

@ -15,3 +15,7 @@ etc/*.conf
etc/*.ini
AUTHORS
ChangeLog
dist
billistix/versioninfo
doc/source/api/*
doc/build/*

20
billistix/version.py Normal file
View File

@ -0,0 +1,20 @@
# Copyright 2012 Managed I.T.
#
# Author: Kiall Mac Innes <kiall@managedit.ie>
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from billistix.openstack.common import version as common_version
PRE_VERSION = '2013.1'
version_info = common_version.VersionInfo('billistix', pre_version=PRE_VERSION)

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!onsusr/bin/env python
# Copyright 2012 Bouvet ASA
#
# Author: Endre Karlson <endre.karlson@bouvet.no>
@ -18,6 +18,7 @@ from setuptools import setup, find_packages
import textwrap
from billistix.openstack.common import setup as common_setup
from billistix.version import version_info as version
install_requires = common_setup.parse_requirements(['tools/pip-requires'])
tests_require = common_setup.parse_requirements(['tools/test-requires'])
@ -28,11 +29,9 @@ dependency_links = common_setup.parse_dependency_links([
'tools/setup-requires'
])
version = '0.1'
setup(
name='billistix',
version=version,
version=version.canonical_version_string(always=True),
description='Billing as a Service',
author='Endre Karlson',
author_email='endre.karlson@bouvet.no',