Skip to content

Commit

Permalink
Merge branch 'prerelease-0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
Rémy HUBSCHER committed Jun 21, 2017
2 parents a95b516 + d4f2567 commit 76d2c16
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Changelog for django-x509
=========================

0.4 (unreleased)
0.4 (2017-06-21)
----------------

- Nothing changed yet.
- Add Django 1.9 support. (#20)


0.3 (2015-12-08)
Expand Down
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
VIRTUALENV = virtualenv
TEMPDIR := $(shell mktemp -d)

develop:
python setup.py develop

Expand All @@ -6,3 +9,9 @@ demo:
(cd demo; python setup.py develop)
demo migrate
demo runserver

build-requirements:
$(VIRTUALENV) $(TEMPDIR)
$(TEMPDIR)/bin/pip install -U pip
$(TEMPDIR)/bin/pip install -Ue "."
$(TEMPDIR)/bin/pip freeze | grep -v -- '-e' > requirements-release.txt
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.dev0
0.4
8 changes: 8 additions & 0 deletions requirements-release.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
asn1crypto==0.22.0
cffi==1.10.0
cryptography==1.9
idna==2.5
pycparser==2.17
pyOpenSSL==17.0.0
python-dateutil==2.6.0
six==1.10.0

0 comments on commit 76d2c16

Please sign in to comment.