From 716752e2fbced0f166ae31a9b17673658501309c Mon Sep 17 00:00:00 2001 From: Scott Kitterman Date: Sat, 17 Feb 2018 15:08:25 -0500 Subject: [PATCH] Move version definition to dkim_milter/__init__.py and improve setup.py requirements --- CHANGES | 5 ++++- dkimpy_milter/__init__.py | 1 + setup.py | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 96f6bc5..cbbb6b4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,11 @@ -0.9.1 UNRELEASED +0.9.1 2018-02-17 - DKIM signing and verification using both RSA and Ed25519 - The following configuration options are supported (same definition as OpenDKIM): Domain, KeyFile, KeyFileEd25519, Mode, PidFile, Selector, Socket, Syslog, UMask, and UserID (see dkimpy-milter.conf.5) - This is an Alpha grade release and while the implemented features work, it is nowhere near being a complete package + +0.9.2 UNRELEASED + - Improved pakcage requirements definition diff --git a/dkimpy_milter/__init__.py b/dkimpy_milter/__init__.py index 57758f0..ab57cab 100644 --- a/dkimpy_milter/__init__.py +++ b/dkimpy_milter/__init__.py @@ -40,6 +40,7 @@ from dkimpy_milter.util import setExceptHook from dkimpy_milter.util import write_pid from dkimpy_milter.util import read_keyfile +__version__ = "0.9.2" FWS = re.compile(r'\r?\n[ \t]+') class dkimMilter(Milter.Base): diff --git a/setup.py b/setup.py index 9351a82..c296d42 100644 --- a/setup.py +++ b/setup.py @@ -18,12 +18,13 @@ from setuptools import setup import os +import dkimpy_milter description = "Domain Keys Identified Mail (DKIM) signing/verifying milter for Postfix/Sendmail." setup( name='dkimpy-milter', - version='0.9.1', + version=dkimpy_milter.__version__, author='Scott Kitterman', author_email='scott@kitterman.com', url='https://launchpad.net/dkimpy-milter', @@ -51,6 +52,6 @@ setup( data_files=[(os.path.join('share', 'man', 'man5'), ['man/dkimpy-milter.conf.5']), ('etc', ['etc/dkimpy-milter.conf'])], - install_requires = ['dkimpy', 'pymilter', 'authres>=1.0.2'], + install_requires = ['dkimpy>=0.7', 'pymilter', 'authres>=1.0.2', 'nacl'], zip_safe = False, )