diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 7ff097c3c..000000000 --- a/LICENSE.txt +++ /dev/null @@ -1 +0,0 @@ -See LICENSE diff --git a/MANIFEST.in b/MANIFEST.in index 568ab3f2e..9575a1c62 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,2 @@ -include LICENSE.txt -include README.md -recursive-include docs * -recursive-include certbot_route53/tests/testdata * +include LICENSE +include README diff --git a/README.md b/README.md index 59af3615c..7dab0b7f6 100644 --- a/README.md +++ b/README.md @@ -3,32 +3,29 @@ ### Before you start -It's expected that the root hosted zone for the domain in question already exists in your account. +It's expected that the root hosted zone for the domain in question already +exists in your account. ### Setup 1. Create a virtual environment -2. Make sure you have libssl-dev (or your regional equivalent) installed. -`pycparser` suffers from -https://github.com/eliben/pycparser/issues/148, which is why we need to -recompile it, which depends on `libssl-dev`. +2. Update its pip and setuptools (`VENV/bin/pip install -U setuptools pip`) +to avoid problems with cryptography's dependency on setuptools>=11.3. -3. Install by adding these to your requirements.txt file: - -``` ---no-binary pycparser --e git+https://github.com/certbot/certbot.git#egg=certbot --e git+https://github.com/certbot/certbot.git#egg=acme&subdirectory=acme -certbot-route53 -``` -We need DNS01 support in certbot, which is only available in master for now. +3. Make sure you have libssl-dev and libffi (or your regional equivalents) +installed. You might have to set compiler flags to pick things up (I have to +use `CPPFLAGS=-I/usr/local/opt/openssl/include +LDFLAGS=-L/usr/local/opt/openssl/lib` on my macOS to pick up brew's openssl, +for example). +4. Install this package. ### How to use it Make sure you have access to AWS's Route53 service, either through IAM roles or -via `.aws/credentials`. +via `.aws/credentials`. Check out +(sample-aws-policy.json)[sample-aws-policy.json]. To generate a certificate: ``` diff --git a/setup.cfg b/setup.cfg index b88034e41..3c6e79cf3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,2 @@ -[metadata] -description-file = README.md +[bdist_wheel] +universal=1 diff --git a/setup.py b/setup.py index 4b9b754a8..49b1ea467 100644 --- a/setup.py +++ b/setup.py @@ -6,24 +6,10 @@ from setuptools import find_packages version = '0.1.5' install_requires = [ - 'acme>=0.9.0.dev0', - 'certbot>=0.9.0.dev0', - 'PyOpenSSL', - 'pyparsing>=1.5.5', # Python3 support; perhaps unnecessary? - 'setuptools', # pkg_resources + 'acme>=0.9.0', + 'certbot>=0.9.0', 'zope.interface', 'boto3', - 'dnspython', -] - -if sys.version_info < (2, 7): - install_requires.append('mock<1.1.0') -else: - install_requires.append('mock') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', ] setup( @@ -51,7 +37,6 @@ setup( 'Topic :: Utilities', ], packages=find_packages(), - include_package_data=True, install_requires=install_requires, keywords=['certbot', 'route53', 'aws'], entry_points={