From 9857a0f7ded9ad8e92ecd1a0fa011dd7cb455e2a Mon Sep 17 00:00:00 2001 From: Peter Urda Date: Sun, 5 Feb 2017 11:42:29 -0800 Subject: [PATCH 1/5] Moving to new branch layout --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 90b52f8..0314278 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: branches: only: - master - - release + - develop before_install: - echo Travis OS Name ... ${TRAVIS_OS_NAME} From c5430a888de38eb76ab5ab42ced0b7b17af18833 Mon Sep 17 00:00:00 2001 From: Peter Urda Date: Sun, 5 Feb 2017 12:02:49 -0800 Subject: [PATCH 2/5] Just make it a requirements file --- .travis.yml | 2 +- requirements-travis.txt => requirements.txt | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename requirements-travis.txt => requirements.txt (100%) diff --git a/.travis.yml b/.travis.yml index 0314278..6b53394 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/requirements-travis.txt b/requirements.txt similarity index 100% rename from requirements-travis.txt rename to requirements.txt From c0e790d2853b9bc508dbc6056ecf2d7a927ab190 Mon Sep 17 00:00:00 2001 From: Peter Urda Date: Sun, 5 Feb 2017 12:38:14 -0800 Subject: [PATCH 3/5] Freshen up Makefile --- Makefile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index cc3d56f..48aedc8 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,21 @@ +.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: 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 +29,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 From a020f38fa15ad763355226d820754d2378bad4d4 Mon Sep 17 00:00:00 2001 From: Peter Urda Date: Sun, 5 Feb 2017 14:01:06 -0800 Subject: [PATCH 4/5] Fix nesting, list numbering? --- README.rst | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/README.rst b/README.rst index e498a82..f5d1521 100644 --- a/README.rst +++ b/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! From 0cd25fd1258ba3ce5a72737689a5170f1bcf7445 Mon Sep 17 00:00:00 2001 From: Peter Urda Date: Sun, 5 Feb 2017 16:04:24 -0800 Subject: [PATCH 5/5] Universal Wheel, Twine, Makefile updates --- .flake8 | 1 + .gitignore | 1 + CHANGELOG.md | 6 ++++++ Makefile | 27 +++++++++++++++++++++++++++ letsencrypt/__init__.py | 2 +- requirements.txt | 1 + setup.cfg | 5 +++++ setup.py | 2 +- 8 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 setup.cfg diff --git a/.flake8 b/.flake8 index 6ffaab3..3a43170 100644 --- a/.flake8 +++ b/.flake8 @@ -1,4 +1,5 @@ [flake8] exclude = + build/*, letsencrypt/migrations/*, scripts/version_manager.py, diff --git a/.gitignore b/.gitignore index e935d37..9438aa2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ __pycache__/ MANIFEST *.egg-info/ +build/ dist/ # Testing diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f78125..020f182 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/Makefile b/Makefile index 48aedc8..20b2b33 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,33 @@ help: # Show this help screen 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 # Run the full testing suite diff --git a/letsencrypt/__init__.py b/letsencrypt/__init__.py index 15bff31..4c8455c 100644 --- a/letsencrypt/__init__.py +++ b/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' diff --git a/requirements.txt b/requirements.txt index ac447f2..30ed03b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ coverage Django flake8 +twine diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..79bc678 --- /dev/null +++ b/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 diff --git a/setup.py b/setup.py index e065a0e..a03a96d 100644 --- a/setup.py +++ b/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',