Skip to content
This repository was archived by the owner on Oct 8, 2019. It is now read-only.

Commit 3a2e944

Browse files
ramirojarshwah
authored andcommitted
Updated documentation for 2.1.0 release.
1 parent db6fc36 commit 3a2e944

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

CHANGELOG

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
n.n.n - Unreleased
2-
==================
3-
4-
- Upgraded tox to 2.9.1, versions >= 2.7.0 can pass PYTHONPATH to test environments again
1+
2.1.0 - January nn, 2018
2+
========================
3+
4+
- Upgraded tox to 2.9.1, versions >= 2.7.0 can pass PYTHONPATH to test
5+
environments again
6+
- Updated URL of 'deadsnakes' old Python version PPA respository for Ubuntu
7+
- Renamed shell aliases so DB backend names in test commands are in sync with
8+
Django CI Jenkins jobs
9+
- Removed Python 2.7 as per Django >= 2.0 Python version support timeline
10+
- Updated suggested versions of Vagrant and VirtualBox, clarify vbguest plugin
11+
suggestion in README file
12+
- Added a couple of Linux host-specific trobleshooting notes to the README file
513

614
2.0.0 - February 18, 2017
715
=========================

LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2012-2013, Julien Phalip.
1+
Copyright (c) 2012-2018, Julien Phalip.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without
@@ -25,4 +25,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
2525
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
2626
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2727
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Then, either:
7777
* Or, if you have already downloaded the box file separately, then run the
7878
following command in order to import the box into vagrant and boot up the VM:
7979

80-
(host) $ vagrant box add path/to/django-box-2.0.box --name djangoproject/django-box-2.0
80+
(host) $ vagrant box add path/to/django-box-2.1.box --name djangoproject/django-box-2.1
8181
(host) $ cd django-box
8282
(host) $ vagrant up
8383

@@ -87,10 +87,10 @@ Then, either:
8787

8888
You can download the box file directly from (make sure you update the version
8989
component):
90-
https://atlas.hashicorp.com/djangoproject/boxes/django-box-2.0/versions/2.0.0/providers/virtualbox.box
90+
https://atlas.hashicorp.com/djangoproject/boxes/django-box-2.1/versions/2.1.0/providers/virtualbox.box
9191

9292
You can check what the latest released version is here:
93-
https://atlas.hashicorp.com/djangoproject/boxes/django-box-2.0/
93+
https://atlas.hashicorp.com/djangoproject/boxes/django-box-2.1/
9494

9595
As the VM boots up, it will prompt you to enter your host machine's
9696
administrator password (the same that you use for logging into your host
@@ -250,7 +250,7 @@ Building a new version
250250
----------------------
251251

252252
To upgrade or alter the original box, you'll need to recreate it. You'll need to
253-
have Ansible 2.1 or greater installed, and django >= 2.0 in a folder beside the
253+
have Ansible 2.1 or greater installed, and django >= 2.1 in a folder beside the
254254
django-box project as described above. You should also have
255255
the [vagrant-vbguest](https://github.com/dotless-de/vagrant-vbguest) plugin
256256
installed to ensure the correct GuestAdditions are configured within the image.
@@ -263,9 +263,9 @@ The automatic build process will take about 20 minutes. If the new build should
263263
be saved, then you can package the output:
264264

265265
(host) $ VAGRANT_VAGRANTFILE=Vagrantfile-build vagrant package \
266-
--output django-box-2.0.box
266+
--output django-box-2.1.box
267267

268-
(host) $ vagrant box add django-box-2.0.box --name djangoproject/django-box-2.0 # optional - for testing
268+
(host) $ vagrant box add django-box-2.1.box --name djangoproject/django-box-2.1 # optional - for testing
269269

270270
Note that compiling a new version should only be required when releasing a new
271271
build to atlas.hashicorp.com.

0 commit comments

Comments
 (0)