Skip to content

Commit

Permalink
Revert the setup.cfg infra and go back to requirements.txt
Browse files Browse the repository at this point in the history
I've continually run into problems with the setup.cfg route that I'm not
interested in investing the time to debug and fix. Looking around it doesn't
seem to be very common yet so I've had a hard time finding help/docs etc.
  • Loading branch information
ross committed Apr 20, 2018
1 parent 33efc52 commit f86c06d
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 75 deletions.
5 changes: 3 additions & 2 deletions CONTRIBUTING.md
Expand Up @@ -38,9 +38,10 @@ Here are a few things you can do that will increase the likelihood of your pull

- Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).

## Development prerequisites
## Development setup

- setuptools >= 30.3.0
pip instal -r requirements.txt
pip instal -r requirements-dev.txt

## License note

Expand Down
7 changes: 7 additions & 0 deletions requirements-dev.txt
@@ -0,0 +1,7 @@
coverage
mock
nose
pycodestyle==2.4.0
pyflakes==1.6.0
requests_mock
twine==1.11.0
22 changes: 22 additions & 0 deletions requirements.txt
@@ -0,0 +1,22 @@
PyYaml==3.12
azure-common==1.1.9
azure-mgmt-dns==1.0.1
boto3==1.7.5
botocore==1.10.5
dnspython==1.15.0
docutils==0.14
dyn==1.8.1
futures==3.2.0
google-cloud==0.32.0
incf.countryutils==1.0
ipaddress==1.0.22
jmespath==0.9.3
msrestazure==0.4.27
natsort==5.2.0
nsone==0.9.100
ovh==0.4.8
python-dateutil==2.6.1
requests==2.18.4
s3transfer==0.1.13
six==1.11.0
setuptools==38.5.2
5 changes: 3 additions & 2 deletions script/bootstrap
Expand Up @@ -19,10 +19,11 @@ if [ ! -d "$VENV_NAME" ]; then
fi
. "$VENV_NAME/bin/activate"

pip install -e .
pip install -U pip
pip install -r requirements.txt

if [ "$ENV" != "production" ]; then
pip install -e .[dev,test]
pip install -r requirements-dev.txt
fi

if [ ! -L ".git/hooks/pre-commit" ]; then
Expand Down
69 changes: 0 additions & 69 deletions setup.cfg

This file was deleted.

47 changes: 45 additions & 2 deletions setup.py
@@ -1,5 +1,48 @@
#!/usr/bin/env python
from setuptools import setup

from os.path import dirname, join
import octodns

setup()
try:
from setuptools import find_packages, setup
except ImportError:
from distutils.core import find_packages, setup

cmds = (
'compare',
'dump',
'report',
'sync',
'validate'
)
cmds_dir = join(dirname(__file__), 'octodns', 'cmds')
console_scripts = {
'octodns-{name} = octodns.cmds.{name}:main'.format(name=name)
for name in cmds
}

setup(
author='Ross McFarland',
author_email='rwmcfa1@gmail.com',
description=octodns.__doc__,
entry_points={
'console_scripts': console_scripts,
},
install_requires=[
'PyYaml>=3.12',
'dnspython>=1.15.0',
'futures>=3.2.0',
'incf.countryutils>=1.0',
'ipaddress>=1.0.22',
'natsort>=5.2.0',
# botocore doesn't like >=2.7.0 for some reason
'python-dateutil>=2.6.0,<2.7.0',
'requests>=2.18.4'
],
license='MIT',
long_description=open('README.md').read(),
name='octodns',
packages=find_packages(),
url='https://github.com/github/octodns',
version=octodns.__VERSION__,
)

0 comments on commit f86c06d

Please sign in to comment.