Merge branch 'develop' into master

.flake8

@@ -1,4 +1,5 @@
 [flake8]
 exclude =
+    build/*,
     letsencrypt/migrations/*,
     scripts/version_manager.py,

.gitignore

@@ -6,6 +6,7 @@ __pycache__/
 MANIFEST
 
 *.egg-info/
+build/
 dist/
 
 # Testing

.travis.yml

@@ -36,7 +36,7 @@ matrix:
 branches:
   only:
     - master
-    - release
+    - develop
 
 before_install:
   - echo Travis OS Name ... ${TRAVIS_OS_NAME}
@@ -46,7 +46,7 @@ before_install:
 
 install:
   - pip install --upgrade pip
-  - pip install -r requirements-travis.txt
+  - pip install -r requirements.txt
   - pip install Django==$DJANGO_VERSION
 
 script:

CHANGELOG.md

@@ -1,5 +1,11 @@
 # django-letsencrypt CHANGELOG
 
+## v1.0.6
+
+- Internal Changes
+  - Started using `twine`
+  - Started uploading `bdist_wheel`
+
 ## v1.0.5
 
 - Internal Changes

Makefile

@@ -1,12 +1,48 @@
+.PHONY: help
+help: # Show this help screen
+	@ack '^[a-zA-Z_-]+:.*?# .*$$' $(MAKEFILE_LIST) |\
+	sort |\
+	awk 'BEGIN {FS = ":.*?# "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
+
+
+.PHONY: build
+build: test clean build-package # Clean, Test, and Build the package
+
+
+.PHONY: build-package
+build-package: # Build 'sdist' and 'bdist_wheel' for this package
+	python setup.py sdist bdist_wheel
+
+
+.PHONY: clean
+clean: # Clean up build, test, and other project artifacts
+	rm -rf \
+	./.cache \
+	./*.egg-info \
+	./build \
+	./dist \
+	./htmlcov \
+	.coverage \
+	coverage.xml \
+	&& :
+
+
+.PHONY: publish
+publish: build # Build, sign, and publish the package
+	twine upload dist/* --sign -r pypi
+
+
 .PHONY: test
-test: test-flake test-unit
+test: test-flake test-unit # Run the full testing suite
+
 
 .PHONY: test-flake
-test-flake:
+test-flake: # Run flake8 against project files
 	flake8 -v
 
+
 .PHONY: test-unit
-test-unit:
+test-unit: # Run only unit tests
 	coverage run \
 	--source="./letsencrypt" \
 	--omit="\
@@ -20,6 +56,7 @@ test-unit:
 	runtests.py \
 	&& coverage report
 
+
 .PHONY: version-check
 version-check: # Verify the project version string is correct across the project
 	./scripts/version_manager.py check

README.rst

@@ -16,35 +16,35 @@ and :code:`response` for your app to serve up the necessary information for
 Installation & Configuration
 ----------------------------
 
-1. :code:`pip install django-letsencrypt`
+#. :code:`pip install django-letsencrypt`
 
-2. Add :code:`letsencrypt` to your :code:`INSTALLED_APPS`
+#. Add :code:`letsencrypt` to your :code:`INSTALLED_APPS`
 
-.. code:: python
+   .. code:: python
 
-    INSTALLED_APPS = [
-        ... ,
-        'letsencrypt',
-        ... ,
-    ]
+       INSTALLED_APPS = [
+           ... ,
+           'letsencrypt',
+           ... ,
+       ]
 
-3. Include the :code:`letsencrypt` in your project's :code:`urls.py`,
+#. Include the :code:`letsencrypt` in your project's :code:`urls.py`,
    or where applicable (usually your root :code:`urls.py`).
 
-.. code:: python
+   .. code:: python
 
-    url(r'^\.well-known/', include('letsencrypt.urls'))
+       url(r'^\.well-known/', include('letsencrypt.urls'))
 
-4. Run :code:`manage.py migrate` to create the required table for the
+#. Run :code:`manage.py migrate` to create the required table for the
    :code:`letsencrypt` model
 
-5. Create your :code:`ACME Challenge` objects in your Django admin interface
+#. Create your :code:`ACME Challenge` objects in your Django admin interface
 
-6. Test your :code:`ACME Challenge` objects and their responses by visiting
+#. Test your :code:`ACME Challenge` objects and their responses by visiting
    them:
 
-.. code::
+   .. code::
 
-    {Django Site}/.well-known/acme-challenge/challenge_text
+       {Django Site}/.well-known/acme-challenge/challenge_text
 
-7. Enjoy your easy to manage `ACME Challenges` inside your Django project!
+#. Enjoy your easy to manage `ACME Challenges` inside your Django project!

letsencrypt/__init__.py

@@ -14,6 +14,6 @@
 limitations under the License.
 """
 
-__version__ = '1.0.5'
+__version__ = '1.0.6'
 
 default_app_config = 'letsencrypt.apps.LetsEncryptConfig'

requirements-travis.txt → requirements.txt

@@ -1,3 +1,4 @@
 coverage
 Django
 flake8
+twine

setup.cfg

@@ -0,0 +1,5 @@
+[bdist_wheel]
+# This flag says that the code is written to work on both Python 2 and Python
+# 3. If at all possible, it is good practice to do this. If you cannot, you
+# will need to generate wheels for each Python version that you support.
+universal=1

setup.py

@@ -24,7 +24,7 @@
 
 setup(
     name='django-letsencrypt',
-    version='1.0.5',
+    version='1.0.6',
     packages=['letsencrypt'],
     include_package_data=True,
     license='Apache License, Version 2.0',