Merge pull request #4 from lifeonmarspt/pkoch_cleanup

Cleanup installation

LICENSE.txt

@@ -1 +0,0 @@
-See LICENSE

MANIFEST.in

@@ -1,4 +1,2 @@
-include LICENSE.txt
+include LICENSE
-include README.md
+include README
-recursive-include docs *
-recursive-include certbot_route53/tests/testdata *

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.
+2. Update its pip and setuptools (`VENV/bin/pip install -U setuptools pip`)
-`pycparser` suffers from
+to avoid problems with cryptography's dependency on setuptools>=11.3.
-https://github.com/eliben/pycparser/issues/148, which is why we need to
-recompile it, which depends on `libssl-dev`.
 
-3. Install by adding these to your requirements.txt file:
+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
---no-binary pycparser
+LDFLAGS=-L/usr/local/opt/openssl/lib` on my macOS to pick up brew's openssl,
--e git+https://github.com/certbot/certbot.git#egg=certbot
+for example).
--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.
 
+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:
 ```

setup.cfg

@@ -1,2 +1,2 @@
-[metadata]
+[bdist_wheel]
-description-file = README.md
+universal=1

setup.py

@@ -6,24 +6,10 @@ from setuptools import find_packages
 version = '0.1.5'
 
 install_requires = [
-    'acme>=0.9.0.dev0',
+    'acme>=0.9.0',
-    'certbot>=0.9.0.dev0',
+    'certbot>=0.9.0',
-    'PyOpenSSL',
-    'pyparsing>=1.5.5',  # Python3 support; perhaps unnecessary?
-    'setuptools',  # pkg_resources
     '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={

tester.pkoch-macos_sierra.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+# I just wanted a place to dump the incantations I use for testing.
+set -e
+
+brew install openssl libffi
+
+rm -rf scratch; mkdir scratch
+
+virtualenv scratch/venv -p /usr/local/bin/python2.7
+scratch/venv/bin/pip install -U pip setuptools
+
+CPPFLAGS=-I/usr/local/opt/openssl/include LDFLAGS=-L/usr/local/opt/openssl/lib scratch/venv/bin/pip install -e .
+
+scratch/venv/bin/certbot certonly -n --agree-tos --test-cert --email pkoch@lifeonmars.pt -a certbot-route53:auth -d pkoch.lifeonmars.pt --work-dir scratch --config-dir scratch --logs-dir scratch
+
+rm -rf scratch