1
0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00

Apply review comments

define 3 kinds of requirements (base, dev, test)
retrieve version from __init__.py
define setuptools minimal version

in CI install full (base, dev, test) dependencies
This commit is contained in:
Hervé Beraud
2017-11-04 22:01:18 +01:00
parent 77d2fd1eb4
commit dd692320c9
5 changed files with 21 additions and 41 deletions

View File

@@ -3,6 +3,5 @@ include CONTRIBUTING.md
include LICENSE include LICENSE
include docs/* include docs/*
include octodns/* include octodns/*
include requirements*.txt
include script/* include script/*
include tests/* include tests/*

View File

@@ -21,7 +21,7 @@ $ cd dns
$ virtualenv env $ virtualenv env
... ...
$ source env/bin/activate $ source env/bin/activate
$ pip install -U setuptools $ pip install -U setuptools>⁼30.3.0
$ pip install octodns $ pip install octodns
$ mkdir config $ mkdir config
``` ```

View File

@@ -1,25 +1,5 @@
from __future__ import absolute_import, division, print_function, \ from __future__ import absolute_import, division, print_function, \
unicode_literals unicode_literals
import pkg_resources
from os import path
from setuptools.config import read_configuration
def _extract_version(package_name): __version__ = '0.8.8'
try:
return pkg_resources.get_distribution(package_name).version
except pkg_resources.DistributionNotFound:
_conf = read_configuration(
path.join(
path.dirname(path.dirname(__file__)),
'setup.cfg'
)
)
return _conf['metadata']['version']
__version__ = _extract_version('octodns')
if __name__ == "__main__":
print(__version__)

View File

@@ -22,7 +22,7 @@ fi
pip install -e . pip install -e .
if [ "$ENV" != "production" ]; then if [ "$ENV" != "production" ]; then
pip install -e .[dev] pip install -e .[dev,test]
fi fi
if [ ! -L ".git/hooks/pre-commit" ]; then if [ ! -L ".git/hooks/pre-commit" ]; then

View File

@@ -2,7 +2,7 @@
name = octodns name = octodns
description = "DNS as code - Tools for managing DNS across multiple providers" description = "DNS as code - Tools for managing DNS across multiple providers"
long_description = file: README.md long_description = file: README.md
version = 0.8.8 version = attr: octodns.__version__
author = Ross McFarland author = Ross McFarland
author_email = rwmcfa1@gmail.com author_email = rwmcfa1@gmail.com
url = https://github.com/github/octodns url = https://github.com/github/octodns
@@ -20,27 +20,14 @@ classifiers =
[options] [options]
install_requires = install_requires =
PyYaml==3.12 PyYaml>=3.12
azure-mgmt-dns==1.0.1 dnspython>=1.15.0
azure-common==1.1.6
boto3==1.4.6
botocore==1.6.8
dnspython==1.15.0
docutils==0.14
dyn==1.8.0
futures==3.1.1 futures==3.1.1
google-cloud==0.27.0
incf.countryutils==1.0 incf.countryutils==1.0
ipaddress==1.0.18 ipaddress==1.0.18
jmespath==0.9.3
msrestazure==0.4.10
natsort==5.0.3 natsort==5.0.3
nsone==0.9.14
ovh==0.4.7
python-dateutil==2.6.1 python-dateutil==2.6.1
requests==2.13.0 requests==2.13.0
s3transfer==0.1.10
six==1.10.0
packages = find: packages = find:
include_package_data = True include_package_data = True
@@ -58,6 +45,20 @@ exclude =
[options.extras_require] [options.extras_require]
dev = dev =
azure-mgmt-dns==1.0.1
azure-common==1.1.6
boto3==1.4.6
botocore==1.6.8
docutils==0.14
dyn==1.8.0
google-cloud==0.27.0
jmespath==0.9.3
msrestazure==0.4.10
nsone==0.9.14
ovh==0.4.7
s3transfer==0.1.10
six==1.10.0
test =
coverage coverage
mock mock
nose nose