From 493386cebc1269cced59bd497f49c96374dd05ad Mon Sep 17 00:00:00 2001 From: Miguel Marcos Date: Wed, 8 Mar 2017 20:20:11 +0100 Subject: [PATCH] Upgraded jango-extra-views to version 0.9.0 (#181) --- README.md | 4 ++-- docs/index.md | 10 ++-------- requirements/base.txt | 2 +- setup.py | 4 ---- tox.ini | 5 ++--- 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 9f00009d..534310c9 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Django Arctic [![PyPi version](https://img.shields.io/pypi/v/django-arctic.svg)](https://pypi.python.org/pypi/django-arctic/) -[![Travis CI](https://api.travis-ci.org/sanoma/django-arctic.svg)](https://travis-ci.org/sanoma/django-arctic/) -[![Coverage Status](https://coveralls.io/repos/github/sanoma/django-arctic/badge.svg?branch=master)](https://coveralls.io/github/sanoma/django-arctic?branch=master) +[![Build Status](https://travis-ci.org/sanoma/django-arctic.svg?branch=develop)](https://travis-ci.org/sanoma/django-arctic) +[![Coverage Status](https://coveralls.io/repos/github/sanoma/django-arctic/badge.svg?branch=develop)](https://coveralls.io/github/sanoma/django-arctic) [![Read the Docs](https://readthedocs.org/projects/django-arctic/badge/?version=latest)](https://django-arctic.readthedocs.io/en/latest/) Django Arctic is a framework that simplifies the creation of custom content management systems. diff --git a/docs/index.md b/docs/index.md index 6cac53e1..78e1a08e 100755 --- a/docs/index.md +++ b/docs/index.md @@ -39,17 +39,11 @@ This is the case that Arctic wants to solve, creation of a CMS with a high degre Arctic is available on PIP: - pip install --process-dependency-links django-arctic + pip install django-arctic or directly from Github: - pip install --process-dependency-links git+ssh://git@github.com/sanoma/django-arctic.git - -**Note:** `--process-dependency-links` is needed so that pip can install an -Arctic dependency, django-extra-views, with a version not yet available in PyPI, -this is needed for full Django 1.10 compatibility. If you are using Arctic in a -requirements file, just add a line with `--process-dependency-links` to avoid -writing this directive in the command line. + pip install git+ssh://git@github.com/sanoma/django-arctic.git ## Getting Started diff --git a/requirements/base.txt b/requirements/base.txt index 4bad5415..a0bff5c7 100755 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,4 @@ -django-extra-views==0.8.0-master +django-extra-views==0.9.0 django-filter==0.15.3 django-widget-tweaks==1.4.1 django-betterforms==1.1.4 \ No newline at end of file diff --git a/setup.py b/setup.py index bd731a2b..65a85407 100755 --- a/setup.py +++ b/setup.py @@ -36,10 +36,6 @@ version=__VERSION__, long_description=README, install_requires=REQUIREMENTS, - dependency_links=['https://github.com/AndrewIngram/' +\ - 'django-extra-views/tarball/' +\ - 'dd5d6b877945eeca6ee04930a7fa441e66a586b0' +\ - '#egg=django_extra_views-0.8.0-master'], packages=find_packages(), include_package_data=True, license='MIT', diff --git a/tox.ini b/tox.ini index ad3d8a0f..c94a8fbc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{27,35,36}-django{18,110} +envlist = py{27,35,36}-django{18,19,110} python: 3.6 [tox:travis] @@ -12,9 +12,8 @@ deps = -efile://{toxinidir} -rrequirements/test.txt django110: Django >= 1.10, < 1.11 + django19: Django >= 1.9, < 1.10 django18: Django >= 1.8, < 1.9 -install_command = - pip install --process-dependency-links {opts} {packages} commands = py.test setenv =