From aadc26a9c817c3698e00280035e14b5252c2a283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 19 Jan 2022 17:22:33 +0100 Subject: [PATCH] chore: upograde dependencies --- .travis.yml | 21 ++++++++++--------- CHANGELOG.md | 4 ++++ README.rst | 5 ++--- requirements.in | 5 +++++ requirements.txt | 53 +++++++++++++++++++++++++++++++++++++++++++++--- setup.py | 2 +- 6 files changed, 73 insertions(+), 17 deletions(-) create mode 100644 requirements.in diff --git a/.travis.yml b/.travis.yml index b455de8..59f8aeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,30 +4,31 @@ language: python cache: pip python: + - "3.10" + - "3.9" - "3.8" - "3.7" - "3.6" env: - - DJANGO="Django>=2.0,<2.1" - - DJANGO="Django>=2.1,<2.2" - DJANGO="Django>=2.2,<3.0" - - DJANGO="Django>=3.0,<3.1" + - DJANGO="Django>=3.2,<4.0" + - DJANGO="Django>=4.0,<4.1" - DJANGO="https://github.com/django/django/archive/master.tar.gz" matrix: - exclude: - - python: "3.8" - env: DJANGO="Django>=2.0,<2.1" - - python: "3.8" - env: DJANGO="Django>=2.1,<2.2" + # exclude: + # - python: "3.8" + # env: DJANGO="Django>=2.0,<2.1" + # - python: "3.8" + # env: DJANGO="Django>=2.1,<2.2" allow_failures: - env: DJANGO="https://github.com/django/django/archive/master.tar.gz" install: + - travis_retry pip install psycopg2==2.9.3 + - travis_retry pip install celery==5.2.3 - travis_retry pip install $DJANGO - - travis_retry pip install psycopg2==2.8.4 - - travis_retry pip install celery==4.1.1 services: - postgresql diff --git a/CHANGELOG.md b/CHANGELOG.md index e5c7ca4..a2389e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog # +## 2.1.0 (2022-xx-xx) + +- Djmail is compatible only with Django >= 2.2. + ## 2.0.0 (2020-02-02) - Djmail doesn't support Python 2.x anymore. (thanks @mhindery) diff --git a/README.rst b/README.rst index b7852e2..39d86be 100644 --- a/README.rst +++ b/README.rst @@ -1,9 +1,8 @@ djmail ====== -.. image:: https://travis-ci.org/bameda/djmail.svg?branch=master - :target: https://travis-ci.org/bameda/djmail - +.. image:: https://app.travis-ci.com/bameda/djmail.svg?branch=master + :target: https://app.travis-ci.com/bameda/djmail djmail is a BSD Licensed, simple and nonobstructive django email middleware. diff --git a/requirements.in b/requirements.in new file mode 100644 index 0000000..f58be7e --- /dev/null +++ b/requirements.in @@ -0,0 +1,5 @@ +django>=2.2 +psycopg2 +celery>=5.2.2 + + diff --git a/requirements.txt b/requirements.txt index 8c42a42..75347f9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,50 @@ -django>=2.0 -psycopg2==2.8.4 -celery==4.1.1 +# +# This file is autogenerated by pip-compile with python 3.10 +# To update, run: +# +# pip-compile requirements.in +# +amqp==5.0.9 + # via kombu +asgiref==3.4.1 + # via django +billiard==3.6.4.0 + # via celery +celery==5.2.3 + # via -r requirements.in +click==8.0.3 + # via + # celery + # click-didyoumean + # click-plugins + # click-repl +click-didyoumean==0.3.0 + # via celery +click-plugins==1.1.1 + # via celery +click-repl==0.2.0 + # via celery +django==4.0.1 + # via -r requirements.in +kombu==5.2.3 + # via celery +prompt-toolkit==3.0.24 + # via click-repl +psycopg2==2.9.3 + # via -r requirements.in +pytz==2021.3 + # via celery +six==1.16.0 + # via click-repl +sqlparse==0.4.2 + # via django +vine==5.0.0 + # via + # amqp + # celery + # kombu +wcwidth==0.2.5 + # via prompt-toolkit + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/setup.py b/setup.py index 3c5711b..ceaefcf 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ maintainer='David Barragán Merino', maintainer_email='bameda@dbarraagan.com', license='BSD', - version='2.0.0', + version='2.1.0', packages=find_packages(exclude=['contrib', 'docs', 'test*']), description=description.strip(), long_description=long_description,