Skip to content

Commit 51fdb28

Browse files
joaopslinsjoaopslins
committed
Merge branch 'master' into omit_type_attributes
# Conflicts: # tests/app/tests/test_webpack.py
2 parents e4db7c7 + 729fbd8 commit 51fdb28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1104
-406
lines changed

‎.circleci/config.yml

+296
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,296 @@
1+
version: 2
2+
workflows:
3+
version: 2
4+
test:
5+
jobs:
6+
- test-3.5-20
7+
- test-3.5-21
8+
- test-3.5-22
9+
10+
- test-3.6-20
11+
- test-3.6-21
12+
- test-3.6-22
13+
- test-3.6-30
14+
- test-3.6-31
15+
- test-3.6-32
16+
17+
- test-3.7-20
18+
- test-3.7-21
19+
- test-3.7-22
20+
- test-3.7-30
21+
- test-3.7-31
22+
- test-3.7-32
23+
24+
- test-3.8-20
25+
- test-3.8-21
26+
- test-3.8-22
27+
- test-3.8-30
28+
- test-3.8-31
29+
- test-3.8-32
30+
31+
- test-3.9-20
32+
- test-3.9-21
33+
- test-3.9-22
34+
- test-3.9-30
35+
- test-3.9-31
36+
- test-3.9-32
37+
38+
- done:
39+
requires:
40+
- test-3.5-20
41+
- test-3.5-21
42+
- test-3.5-22
43+
44+
- test-3.6-20
45+
- test-3.6-21
46+
- test-3.6-22
47+
- test-3.6-30
48+
- test-3.6-31
49+
- test-3.6-32
50+
51+
- test-3.7-20
52+
- test-3.7-21
53+
- test-3.7-22
54+
- test-3.7-30
55+
- test-3.7-31
56+
- test-3.7-32
57+
58+
- test-3.8-20
59+
- test-3.8-21
60+
- test-3.8-22
61+
- test-3.8-30
62+
- test-3.8-31
63+
- test-3.8-32
64+
65+
- test-3.9-20
66+
- test-3.9-21
67+
- test-3.9-22
68+
- test-3.9-30
69+
- test-3.9-31
70+
- test-3.9-32
71+
72+
jobs:
73+
base: &test-template
74+
docker:
75+
- image: circleci/python:3.4-stretch-node
76+
working_directory: ~/repo
77+
steps:
78+
- checkout
79+
- run:
80+
name: python version
81+
command: python --version
82+
83+
- restore_cache:
84+
keys:
85+
- v1-js
86+
- restore_cache:
87+
keys:
88+
- v1-py
89+
90+
- run:
91+
name: JS deps
92+
command: cd tests && yarn
93+
- save_cache:
94+
paths:
95+
- ./npm
96+
key: v1-js
97+
98+
- run:
99+
name: setup python
100+
command: |
101+
python3 -m venv venv
102+
source venv/bin/activate
103+
rm -f requirements.txt
104+
pip install -r tests/requirements/common.txt
105+
pip install -r tests/requirements/django${DJANGO_VERSION}.txt
106+
- save_cache:
107+
paths:
108+
- ./cache/pip
109+
key: v1-py
110+
111+
- run:
112+
name: Run tests
113+
command: |
114+
source venv/bin/activate
115+
cd tests
116+
coverage run --source=webpack_loader manage.py test
117+
coveralls
118+
environment:
119+
COVERALLS_PARALLEL: 1
120+
121+
test-3.5-20:
122+
<<: *test-template
123+
docker:
124+
- image: circleci/python:3.5-stretch-node
125+
environment:
126+
DJANGO_VERSION: "20"
127+
test-3.5-21:
128+
<<: *test-template
129+
docker:
130+
- image: circleci/python:3.5-stretch-node
131+
environment:
132+
DJANGO_VERSION: "21"
133+
test-3.5-22:
134+
<<: *test-template
135+
docker:
136+
- image: circleci/python:3.5-stretch-node
137+
environment:
138+
DJANGO_VERSION: "22"
139+
140+
test-3.6-20:
141+
<<: *test-template
142+
docker:
143+
- image: circleci/python:3.6-stretch-node
144+
environment:
145+
DJANGO_VERSION: "20"
146+
test-3.6-21:
147+
<<: *test-template
148+
docker:
149+
- image: circleci/python:3.6-stretch-node
150+
environment:
151+
DJANGO_VERSION: "21"
152+
test-3.6-22:
153+
<<: *test-template
154+
docker:
155+
- image: circleci/python:3.6-stretch-node
156+
environment:
157+
DJANGO_VERSION: "22"
158+
test-3.6-30:
159+
<<: *test-template
160+
docker:
161+
- image: circleci/python:3.6-stretch-node
162+
environment:
163+
DJANGO_VERSION: "30"
164+
test-3.6-31:
165+
<<: *test-template
166+
docker:
167+
- image: circleci/python:3.6-stretch-node
168+
environment:
169+
DJANGO_VERSION: "31"
170+
test-3.6-32:
171+
<<: *test-template
172+
docker:
173+
- image: circleci/python:3.6-stretch-node
174+
environment:
175+
DJANGO_VERSION: "32"
176+
177+
test-3.7-20:
178+
<<: *test-template
179+
docker:
180+
- image: circleci/python:3.7-stretch-node
181+
environment:
182+
DJANGO_VERSION: "20"
183+
test-3.7-21:
184+
<<: *test-template
185+
docker:
186+
- image: circleci/python:3.7-stretch-node
187+
environment:
188+
DJANGO_VERSION: "21"
189+
test-3.7-22:
190+
<<: *test-template
191+
docker:
192+
- image: circleci/python:3.7-stretch-node
193+
environment:
194+
DJANGO_VERSION: "22"
195+
test-3.7-30:
196+
<<: *test-template
197+
docker:
198+
- image: circleci/python:3.7-stretch-node
199+
environment:
200+
DJANGO_VERSION: "30"
201+
test-3.7-31:
202+
<<: *test-template
203+
docker:
204+
- image: circleci/python:3.7-stretch-node
205+
environment:
206+
DJANGO_VERSION: "31"
207+
test-3.7-32:
208+
<<: *test-template
209+
docker:
210+
- image: circleci/python:3.7-stretch-node
211+
environment:
212+
DJANGO_VERSION: "32"
213+
214+
test-3.8-20:
215+
<<: *test-template
216+
docker:
217+
- image: circleci/python:3.8-buster-node
218+
environment:
219+
DJANGO_VERSION: "20"
220+
test-3.8-21:
221+
<<: *test-template
222+
docker:
223+
- image: circleci/python:3.8-buster-node
224+
environment:
225+
DJANGO_VERSION: "21"
226+
test-3.8-22:
227+
<<: *test-template
228+
docker:
229+
- image: circleci/python:3.8-buster-node
230+
environment:
231+
DJANGO_VERSION: "22"
232+
test-3.8-30:
233+
<<: *test-template
234+
docker:
235+
- image: circleci/python:3.8-buster-node
236+
environment:
237+
DJANGO_VERSION: "30"
238+
test-3.8-31:
239+
<<: *test-template
240+
docker:
241+
- image: circleci/python:3.8-buster-node
242+
environment:
243+
DJANGO_VERSION: "31"
244+
test-3.8-32:
245+
<<: *test-template
246+
docker:
247+
- image: circleci/python:3.8-buster-node
248+
environment:
249+
DJANGO_VERSION: "32"
250+
251+
test-3.9-20:
252+
<<: *test-template
253+
docker:
254+
- image: circleci/python:3.9-buster-node
255+
environment:
256+
DJANGO_VERSION: "20"
257+
test-3.9-21:
258+
<<: *test-template
259+
docker:
260+
- image: circleci/python:3.9-buster-node
261+
environment:
262+
DJANGO_VERSION: "21"
263+
test-3.9-22:
264+
<<: *test-template
265+
docker:
266+
- image: circleci/python:3.9-buster-node
267+
environment:
268+
DJANGO_VERSION: "22"
269+
test-3.9-30:
270+
<<: *test-template
271+
docker:
272+
- image: circleci/python:3.9-buster-node
273+
environment:
274+
DJANGO_VERSION: "30"
275+
test-3.9-31:
276+
<<: *test-template
277+
docker:
278+
- image: circleci/python:3.9-buster-node
279+
environment:
280+
DJANGO_VERSION: "31"
281+
test-3.9-32:
282+
<<: *test-template
283+
docker:
284+
- image: circleci/python:3.9-buster-node
285+
environment:
286+
DJANGO_VERSION: "32"
287+
288+
done:
289+
docker:
290+
- image: circleci/python:3.9-buster-node
291+
steps:
292+
- run:
293+
name: Finish Coveralls
294+
command: |
295+
pip install coveralls
296+
coveralls --finish

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
venv/
2+
*.sqlite3
23

34
# auto generated
45
README.rst
@@ -70,14 +71,15 @@ examples/**/ve/
7071
examples/**/venv/
7172
examples/**/node_modules/
7273
examples/**/assets/bundles/
73-
examples/**/assets/webpack-stats.json
74+
examples/**/webpack-stats.json
7475

7576
tests/ve/
7677
tests/ve3/
7778
tests/venv/
7879
tests/venv3/
7980
tests/node_modules/
8081
tests/assets/bundles/
82+
tests/assets/django_webpack_loader_bundles/
8183
tests/webpack-stats.json
8284
tests/webpack-stats-app2.json
8385

‎.travis.yml

-39
This file was deleted.

‎CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,22 @@ For more general information, view the [readme](README.md).
55
Releases are added to the
66
[github release page](https://github.com/ezhome/django-webpack-loader/releases).
77

8+
## Unreleased
9+
- Applies ignore rule before checking assets
10+
11+
12+
## [1.1.0] -- 2021-06-18
13+
14+
- Added compatibility with `[email protected]`
15+
- Removes bower references in project
16+
- Fix jinja configuration example in README.md
17+
18+
## [1.0.0] -- 2021-05-12
19+
20+
- Added support for custom loader classes
21+
- Added compatibility with `[email protected]`
22+
- Updated and corrected examples
23+
- Updated Python and Django supported versions on tests
824
## [0.6.0] -- 2018-02-22
925

1026
- Added support for 'Access-Control-Allow-Origin' header

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ install:
2727
@$(ENV)/bin/pip install $(requirements)
2828

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

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

0 commit comments

Comments
 (0)