Skip to content

Commit

Permalink
Merge pull request #146 from uploadcare/prepare-v2.6.0
Browse files Browse the repository at this point in the history
Prepare v2.6.0 release.
  • Loading branch information
dmitry-mukhin committed Nov 26, 2018
2 parents 38fa530 + a50fadd commit 353b601
Show file tree
Hide file tree
Showing 7 changed files with 139 additions and 99 deletions.
10 changes: 2 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,19 @@
# https://www.djangoproject.com/download/#supported-versions
# https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django

sudo: false
language: python
dist: xenial
python:
- 2.7
- 3.4
- 3.5
- 3.6
- 3.7
env:
global:
- SUITE="tests/functional"
matrix:
include:
- python: 3.7
dist: xenial
sudo: true

# django tests
- stage: django tests
Expand Down Expand Up @@ -54,8 +52,6 @@ matrix:
- DJANGO=2.0
- SUITE="tests/dj"
- python: 3.7
dist: xenial
sudo: true
env:
- DJANGO=2.0
- SUITE="tests/dj"
Expand All @@ -71,8 +67,6 @@ matrix:
- DJANGO=2.1
- SUITE="tests/dj"
- python: 3.7
dist: xenial
sudo: true
env:
- DJANGO=2.1
- SUITE="tests/dj"
Expand Down
25 changes: 19 additions & 6 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,27 @@
History
-------

Unreleased
~~~~~~~~~~
All notable changes to this project will be documented in this file.

Fixed
+++++
The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_.

- `FileWidget.render()` now works in Django 2.1.
- Obsolete widget setting `data-upload-base-url` replaced with `data-url-base`


`2.6.0`_ - 2018-11-2x
~~~~~~~~~~~~~~~~~~~~~

Changed
+++++++

- Improved error logging.
- Update bundled widget to version ``3.6.1``. See `widget changelog`_.

Fixed
+++++

- `FileWidget.render()` now works in Django 2.1.
- Obsolete widget setting `data-upload-base-url` replaced with `data-url-base`


2.5.0
Expand Down Expand Up @@ -385,3 +393,8 @@ param is unicode and ``requests.request()`` got ``files`` argument, e.g.:

.. _widget changelog: https://github.com/uploadcare/uploadcare-widget/blob/master/HISTORY.markdown
.. _update to version 2.0: https://pyuploadcare.readthedocs.io/en/stable/install.html#update-to-version-2-0
.. _Keep a Changelog: https://keepachangelog.com/en/1.0.0/
.. _Semantic Versioning: https://semver.org/spec/v2.0.0.html

.. _Unreleased: https://github.com/uploadcare/pyuploadcare/compare/v2.6.0...HEAD
.. _2.6.0: https://github.com/uploadcare/pyuploadcare/compare/v2.5.0...v2.6.0
42 changes: 37 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
.. image:: https://ucarecdn.com/2f4864b7-ed0e-4411-965b-8148623aa680/-/inline/yes/uploadcare-logo-mark.svg
:target: https://uploadcare.com/?utm_source=github&utm_campaign=pyuploadcare
:height: 64 px
:width: 64 px
:align: left

=============================================
PyUploadcare: a Python library for Uploadcare
=============================================

.. image:: https://badge.fury.io/py/pyuploadcare.svg
:target: https://badge.fury.io/py/pyuploadcare
.. image:: https://travis-ci.org/uploadcare/pyuploadcare.png?branch=master
:target: https://travis-ci.org/uploadcare/pyuploadcare
:alt: Build Status
Expand All @@ -14,6 +22,9 @@ PyUploadcare: a Python library for Uploadcare
.. image:: https://landscape.io/github/uploadcare/pyuploadcare/master/landscape.svg?style=flat
:target: https://landscape.io/github/uploadcare/pyuploadcare/master
:alt: Code Health
.. image:: https://img.shields.io/badge/tech-stack-0690fa.svg?style=flat
:target: https://stackshare.io/uploadcare/stacks/
:alt: Uploadcare tech stack

Simple file uploads for the web are of most importance
for us at `Uploadcare`_. Today, everyone is used to the routine of
Expand Down Expand Up @@ -67,7 +78,7 @@ Features
Requirements
------------

``pyuploadcare`` requires Python 2.7, 3.4, 3.5 or 3.6.
``pyuploadcare`` requires Python 2.7, 3.4, 3.5, 3.6, 3.7.

If you're using ``pyuploadcare`` with Django, check ``.travis.yml`` for supported
Python-Django combinations.
Expand Down Expand Up @@ -101,6 +112,22 @@ Besides the `Travis CI`_ we use tox. In order to run tests just:
$ pip install tox
$ tox
Security issues
---------------

If you think you ran into something in Uploadcare libraries which might have
security implications, please hit us up at `bugbounty@uploadcare.com`_
or Hackerone.

We'll contact you personally in a short time to fix an issue through co-op and
prior to any public disclosure.

Feedback
--------

Issues and PRs are welcome. You can provide your feedback or drop us a support
request at `hello@uploadcare.com`_.

Contributors
------------

Expand All @@ -111,16 +138,21 @@ Contributors
- `@va1en0k`_
- `@andreshkovskii`_

.. _Uploadcare: https://uploadcare.com/
.. _guide: https://uploadcare.com/docs/guides/django/


.. _Uploadcare: https://uploadcare.com/?utm_source=github&utm_campaign=pyuploadcare
.. _guide: https://uploadcare.com/docs/guides/django/?utm_source=github&utm_campaign=pyuploadcare
.. _simple steps: https://pyuploadcare.readthedocs.org/en/latest/quickstart.html
.. _Sławek Ehlert: https://github.com/slafs
.. _Travis CI: https://travis-ci.org/uploadcare/pyuploadcare
.. _REST: https://uploadcare.com/docs/api_reference/rest/
.. _Upload: https://uploadcare.com/docs/api_reference/upload/
.. _REST: https://uploadcare.com/docs/api_reference/rest/?utm_source=github&utm_campaign=pyuploadcare
.. _Upload: https://uploadcare.com/docs/api_reference/upload/?utm_source=github&utm_campaign=pyuploadcare
.. _@marselester: https://github.com/marselester
.. _@dmitry-mukhin: https://github.com/dmitry-mukhin
.. _@zerc: https://github.com/zerc
.. _@homm: https://github.com/homm
.. _@va1en0k: https://github.com/va1en0k
.. _@andreshkovskii: https://github.com/andrewshkovskii/

.. _bugbounty@uploadcare.com: mailto:bugbounty@uploadcare.com
.. _hello@uploadcare.com: mailto:hello@uploadcare.com
2 changes: 1 addition & 1 deletion pyuploadcare/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

from __future__ import unicode_literals

__version__ = '2.5.0'
__version__ = '2.6.0'

from .api_resources import File, FileList, FileGroup
from .exceptions import (
Expand Down

0 comments on commit 353b601

Please sign in to comment.