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.

Sign up for GitHub

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

Add Django 3.0 and Python 3.8 to CI #48

Merged
merged 12 commits into from
Dec 9, 2019
Merged

Add Django 3.0 and Python 3.8 to CI #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
290a8b0
Add Django 3.0 and Python 3.8 to CI
Dec 8, 2019
5c94198
Change Django 3.0 version range
Dec 8, 2019
438ea2e
Upgrade to PG10 and PostGIS 2.5
Dec 8, 2019
98d45d5
Try to add libgdal-dev to Travis
Dec 8, 2019
b8c8cdc
Disable some tox jobs for debugging
Dec 8, 2019
391beba
Remove python-imaging, replace gdal
Dec 8, 2019
d1bff47
Switch to bionic
Dec 8, 2019
21352b4
Remove libgdal installation for tests
Dec 8, 2019
ab4a256
Final (hopefully) changes
Dec 8, 2019
d558962
Drop Python 3.5
Dec 8, 2019
132cd10
Update docs and changelog
Dec 8, 2019
c0e6d52
Put back Python 3.5, update docs
Dec 9, 2019
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
10 changes: 4 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,19 @@ python:
- "3.5"
- "3.6"
- "3.7"
- "3.8"
cache: pip
dist: xenial
dist: bionic
branches:
only:
- master
before_install:
- sudo apt-get update && sudo apt-get build-dep python-imaging
- sudo service postgresql restart
install:
- pip install tox-travis
addons:
postgresql: "9.6"
postgresql: "10"
apt:
packages:
- postgresql-9.6-postgis-2.4
- postgresql-10-postgis-2.5
services:
- postgresql
before_script:
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ All notable changes to `model_bakery` will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased](https://github.com/model-bakers/model_bakery/tree/master)

### Added

### Changed
- Improve code comments (https://github.com/model-bakers/model_bakery/pull/31)
- Switch to tox-travis (https://github.com/model-bakers/model_bakery/pull/43)
- Add black job (https://github.com/model-bakers/model_bakery/pull/42)
- README.md instead of rst (https://github.com/model-bakers/model_bakery/pull/44)
- Add Django 3.0 and Python 3.8 to CI (https://github.com/model-bakers/model_bakery/pull/48/)

### Removed

## [1.0.2](https://pypi.org/project/model-bakery/1.0.2/)

### Added
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ As an open source project, Model Bakery welcomes contributions of many forms. Ex
Compatibility
=============

model_bakery supports Django >= 1.11 and Python >= 3.5
model_bakery supports Django >= 1.11

Install
=======
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[tox]
envlist =
py{35,36,37}-django{111,20,21,22}-{postgresql,sqlite}
py35-django{111,20,21,22}-{postgresql,sqlite}
py{36,37,38}-django{111,20,21,22,30}-{postgresql,sqlite}
flake8
black

Expand All @@ -9,6 +10,7 @@ python =
3.5: py35
3.6: py36,flake8,black
3.7: py37
3.8: py38

[testenv]
setenv =
Expand All @@ -24,6 +26,7 @@ deps =
django20: Django==2.0
django21: Django==2.1
django22: Django==2.2
django30: Django>=3.0a1,<3.1
postgresql: psycopg2-binary
commands =
pytest
Expand Down