Skip to content
Closed
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
249 changes: 177 additions & 72 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,72 @@ workflows:
version: 2
test:
jobs:
- test-3.4-18
- test-3.4-19
- test-3.4-110
- test-3.4-111

- test-3.5-18
- test-3.5-19
- test-3.5-110
- test-3.5-111

- test-3.6-18
- test-3.6-19
- test-3.6-110
- test-3.6-111
- test-3.5-20
- test-3.5-21
- test-3.5-22

- test-3.6-20
- test-3.6-21
- test-3.6-22
- test-3.6-30
- test-3.6-31
- test-3.6-32

- test-3.7-18
- test-3.7-19
- test-3.7-110
- test-3.7-111
- test-3.7-20
- test-3.7-21
- test-3.7-22
- test-3.7-30
- test-3.7-31
- test-3.7-32

- test-3.8-20
- test-3.8-21
- test-3.8-22
- test-3.8-30
- test-3.8-31
- test-3.8-32

- test-3.9-20
- test-3.9-21
- test-3.9-22
- test-3.9-30
- test-3.9-31
- test-3.9-32

- done:
requires:
- test-3.5-20
- test-3.5-21
- test-3.5-22

- test-3.6-20
- test-3.6-21
- test-3.6-22
- test-3.6-30
- test-3.6-31
- test-3.6-32

- test-3.7-20
- test-3.7-21
- test-3.7-22
- test-3.7-30
- test-3.7-31
- test-3.7-32

- test-3.8-20
- test-3.8-21
- test-3.8-22
- test-3.8-30
- test-3.8-31
- test-3.8-32

- test-3.9-20
- test-3.9-21
- test-3.9-22
- test-3.9-30
- test-3.9-31
- test-3.9-32

jobs:
base: &test-template
docker:
Expand Down Expand Up @@ -71,121 +114,183 @@ jobs:
source venv/bin/activate
cd tests
coverage run --source=webpack_loader manage.py test
test-3.4-18:
<<: *test-template
docker:
- image: circleci/python:3.4-stretch-node
environment:
DJANGO_VERSION: "18"
test-3.4-19:
<<: *test-template
docker:
- image: circleci/python:3.4-stretch-node
environment:
DJANGO_VERSION: "19"
test-3.4-110:
<<: *test-template
docker:
- image: circleci/python:3.4-stretch-node
environment:
DJANGO_VERSION: "110"
test-3.4-111:
<<: *test-template
docker:
- image: circleci/python:3.4-stretch-node
environment:
DJANGO_VERSION: "111"
coveralls
environment:
COVERALLS_PARALLEL: 1

test-3.5-18:
test-3.5-20:
<<: *test-template
docker:
- image: circleci/python:3.5-stretch-node
environment:
DJANGO_VERSION: "18"
test-3.5-19:
DJANGO_VERSION: "20"
test-3.5-21:
<<: *test-template
docker:
- image: circleci/python:3.5-stretch-node
environment:
DJANGO_VERSION: "19"
test-3.5-110:
DJANGO_VERSION: "21"
test-3.5-22:
<<: *test-template
docker:
- image: circleci/python:3.5-stretch-node
environment:
DJANGO_VERSION: "110"
test-3.5-111:
DJANGO_VERSION: "22"

test-3.6-20:
<<: *test-template
docker:
- image: circleci/python:3.5-stretch-node
- image: circleci/python:3.6-stretch-node
environment:
DJANGO_VERSION: "111"

test-3.6-18:
DJANGO_VERSION: "20"
test-3.6-21:
<<: *test-template
docker:
- image: circleci/python:3.6-stretch-node
environment:
DJANGO_VERSION: "18"
test-3.6-19:
DJANGO_VERSION: "21"
test-3.6-22:
<<: *test-template
docker:
- image: circleci/python:3.6-stretch-node
environment:
DJANGO_VERSION: "19"
test-3.6-110:
DJANGO_VERSION: "22"
test-3.6-30:
<<: *test-template
docker:
- image: circleci/python:3.6-stretch-node
environment:
DJANGO_VERSION: "110"
test-3.6-111:
DJANGO_VERSION: "30"
test-3.6-31:
<<: *test-template
docker:
- image: circleci/python:3.6-stretch-node
environment:
DJANGO_VERSION: "111"
test-3.6-22:
DJANGO_VERSION: "31"
test-3.6-32:
<<: *test-template
docker:
- image: circleci/python:3.6-stretch-node
environment:
DJANGO_VERSION: "22"
DJANGO_VERSION: "32"

test-3.7-18:
test-3.7-20:
<<: *test-template
docker:
- image: circleci/python:3.7-stretch-node
environment:
DJANGO_VERSION: "18"
test-3.7-19:
DJANGO_VERSION: "20"
test-3.7-21:
<<: *test-template
docker:
- image: circleci/python:3.7-stretch-node
environment:
DJANGO_VERSION: "19"
test-3.7-110:
DJANGO_VERSION: "21"
test-3.7-22:
<<: *test-template
docker:
- image: circleci/python:3.7-stretch-node
environment:
DJANGO_VERSION: "110"
test-3.7-111:
DJANGO_VERSION: "22"
test-3.7-30:
<<: *test-template
docker:
- image: circleci/python:3.7-stretch-node
environment:
DJANGO_VERSION: "111"
test-3.7-22:
DJANGO_VERSION: "30"
test-3.7-31:
<<: *test-template
docker:
- image: circleci/python:3.7-stretch-node
environment:
DJANGO_VERSION: "22"
DJANGO_VERSION: "31"
test-3.7-32:
<<: *test-template
docker:
- image: circleci/python:3.7-stretch-node
environment:
DJANGO_VERSION: "32"

test-3.8-20:
<<: *test-template
docker:
- image: circleci/python:3.8-buster-node
environment:
DJANGO_VERSION: "20"
test-3.8-21:
<<: *test-template
docker:
- image: circleci/python:3.8-buster-node
environment:
DJANGO_VERSION: "21"
test-3.8-22:
<<: *test-template
docker:
- image: circleci/python:3.8-buster-node
environment:
DJANGO_VERSION: "22"
test-3.8-30:
<<: *test-template
docker:
- image: circleci/python:3.8-buster-node
environment:
DJANGO_VERSION: "30"
test-3.8-31:
<<: *test-template
docker:
- image: circleci/python:3.8-buster-node
environment:
DJANGO_VERSION: "31"
test-3.8-32:
<<: *test-template
docker:
- image: circleci/python:3.8-buster-node
environment:
DJANGO_VERSION: "32"

test-3.9-20:
<<: *test-template
docker:
- image: circleci/python:3.9-buster-node
environment:
DJANGO_VERSION: "20"
test-3.9-21:
<<: *test-template
docker:
- image: circleci/python:3.9-buster-node
environment:
DJANGO_VERSION: "21"
test-3.9-22:
<<: *test-template
docker:
- image: circleci/python:3.9-buster-node
environment:
DJANGO_VERSION: "22"
test-3.9-30:
<<: *test-template
docker:
- image: circleci/python:3.9-buster-node
environment:
DJANGO_VERSION: "30"
test-3.9-31:
<<: *test-template
docker:
- image: circleci/python:3.9-buster-node
environment:
DJANGO_VERSION: "31"
test-3.9-32:
<<: *test-template
docker:
- image: circleci/python:3.9-buster-node
environment:
DJANGO_VERSION: "32"

done:
docker:
- image: circleci/python:3.9-buster-node
steps:
- run:
name: Finish Coveralls
command: |
pip install coveralls
coveralls --finish
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
venv/
*.sqlite3

# auto generated
README.rst
Expand Down Expand Up @@ -70,14 +71,15 @@ examples/**/ve/
examples/**/venv/
examples/**/node_modules/
examples/**/assets/bundles/
examples/**/assets/webpack-stats.json
examples/**/webpack-stats.json

tests/ve/
tests/ve3/
tests/venv/
tests/venv3/
tests/node_modules/
tests/assets/bundles/
tests/assets/django_webpack_loader_bundles/
tests/webpack-stats.json
tests/webpack-stats-app2.json

Expand Down
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,29 @@ For more general information, view the [readme](README.md).
Releases are added to the
[github release page](https://github.com/ezhome/django-webpack-loader/releases).

## [1.3.0] -- 2021-08-30

- Add option for rel="preload" in JS/CSS tags #203
- Add option for extension appending in the url files #135
- Fixes RemovedInDjango41Warning #290
- Applies IGNORE setting before checking assets #286
- Removed type from link and script tags per #152

NOTE: Skipped version 1.2.0 to match `webpack-bundle-tracker` version


## [1.1.0] -- 2021-06-18

- Added compatibility with `webpack-bundle-tracker@1.1.0`
- Removes bower references in project
- Fix jinja configuration example in README.md

## [1.0.0] -- 2021-05-12

- Added support for custom loader classes
- Added compatibility with `webpack-bundle-tracker@1.0.0-alpha.1`
- Updated and corrected examples
- Updated Python and Django supported versions on tests
## [0.6.0] -- 2018-02-22

- Added support for 'Access-Control-Allow-Origin' header
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ install:
@$(ENV)/bin/pip install $(requirements)

publish: build
@echo "Publishing to pypi..."
@echo "Publishing to $(REPOSITORY)..."
@$(ENV)/bin/twine upload -r $(REPOSITORY) dist/*

register:
@echo "Registering package on pypi..."
@echo "Registering package on $(REPOSITORY)..."
@$(ENV)/bin/twine register -r $(REPOSITORY)
Loading