Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change versioning to calver with incremental #21

Merged
merged 1 commit into from
Dec 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ampoule/__init__.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
from .pool import deferToAMPProcess, pp
from .commands import Shutdown, Ping, Echo
from .child import AMPChild
__version__ = "0.3.1"
from ._version import __version__ as _my_version

__version__ = _my_version.short()


__all__ = [
'deferToAMPProcess',
'pp',
'Shutdown', 'Ping', 'Echo',
'AMPChild'
'AMPChild',
'__version__',
]
11 changes: 11 additions & 0 deletions ampoule/_version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
"""
Provides ampoule version information.
"""

# This file is auto-generated! Do not edit!
# Use `python -m incremental.update ampoule` to change this file.

from incremental import Version

__version__ = Version('ampoule', 17, 12, 0)
__all__ = ["__version__"]
11 changes: 3 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@

from setuptools import setup

try:
import ampoule
version = ampoule.__version__
except ImportError:
version = "0.3.1"

install_requires = ["Twisted>=17[tls]"]

description = """A process pool implementation in Twisted Matrix and AMP"""
Expand All @@ -30,8 +24,7 @@
description = description,
long_description = long_description,
license = "MIT License",
version=version,
install_requires=install_requires,
install_requires=install_requires + ['incremental'],
url="https://github.com/glyph/ampoule",
classifiers = [
'Development Status :: 4 - Beta',
Expand All @@ -44,6 +37,8 @@
],
packages=["ampoule", "ampoule.test", "twisted"],
package_data={'twisted': ['plugins/ampoule_plugin.py']},
use_incremental=True,
setup_requires=['incremental'],
include_package_data = True,
zip_safe=False
)