Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upograde dependencies #52

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
5 changes: 2 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
5 changes: 5 additions & 0 deletions requirements.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
django>=2.2
psycopg2
celery>=5.2.2


53 changes: 50 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
maintainer='David Barragán Merino',
maintainer_email='[email protected]',
license='BSD',
version='2.0.0',
version='2.1.0',
packages=find_packages(exclude=['contrib', 'docs', 'test*']),
description=description.strip(),
long_description=long_description,
Expand Down