Skip to content

Commit

Permalink
Fix tests compatibility and upgrade test deps
Browse files Browse the repository at this point in the history
  • Loading branch information
rvlb committed May 22, 2023
1 parent 70835a5 commit 0c0ff26
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 30 deletions.
39 changes: 19 additions & 20 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@ workflows:
version: 2
test:
jobs:
- test-3.6-22
- test-3.6-30
- test-3.6-31
- test-3.6-32

- test-3.7-22
- test-3.7-30
- test-3.7-31
- test-3.7-32

- test-3.8-22
- test-3.8-30
- test-3.8-31
Expand All @@ -31,18 +21,11 @@ workflows:
- test-3.10-40
- test-3.10-41

- test-3.11-32
- test-3.11-40

- done:
requires:
- test-3.6-22
- test-3.6-30
- test-3.6-31
- test-3.6-32

- test-3.7-22
- test-3.7-30
- test-3.7-31
- test-3.7-32

- test-3.8-22
- test-3.8-30
- test-3.8-31
Expand All @@ -61,6 +44,9 @@ workflows:
- test-3.10-40
- test-3.10-41

- test-3.11-32
- test-3.11-40

jobs:
base: &test-template
docker:
Expand Down Expand Up @@ -256,6 +242,19 @@ jobs:
environment:
DJANGO_VERSION: "41"

test-3.11-32:
<<: *test-template
docker:
- image: circleci/python:3.11-rc-node
environment:
DJANGO_VERSION: "32"
test-3.11-40:
<<: *test-template
docker:
- image: circleci/python:3.11-rc-node
environment:
DJANGO_VERSION: "40"

done:
docker:
- image: circleci/python:3.9-buster-node
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
twine==3.4.1
Django==3.2.19
django-jinja==2.7.0
django-jinja==2.10.2
unittest2==1.1.0
wheel==0.38.1
2 changes: 1 addition & 1 deletion tests/requirements/common.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
coverage==5.5
coveralls==3.2.0
unittest2==1.1.0
django-jinja==2.9.0
django-jinja==2.10.2
2 changes: 1 addition & 1 deletion tests/webpack.config.app2.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ config.entry = {

config.plugins = [
new MiniCssExtractPlugin(),
new BundleTracker({path: __dirname, filename: './webpack-stats-app2.json'})
new BundleTracker({path: __dirname, filename: 'webpack-stats-app2.json'})
];

module.exports = config;
2 changes: 1 addition & 1 deletion tests/webpack.config.error.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = {

plugins: [
new MiniCssExtractPlugin(),
new BundleTracker({path: __dirname, filename: './webpack-stats.json'}),
new BundleTracker({path: __dirname, filename: 'webpack-stats.json'}),
],

module: {
Expand Down
2 changes: 1 addition & 1 deletion tests/webpack.config.gzipTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = {
plugins: [
new MiniCssExtractPlugin(),
new CompressionPlugin(),
new BundleTracker({path: __dirname, filename: './webpack-stats.json'}),
new BundleTracker({path: __dirname, filename: 'webpack-stats.json'}),
],

module: {
Expand Down
2 changes: 1 addition & 1 deletion tests/webpack.config.integrity.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = {

plugins: [
new MiniCssExtractPlugin(),
new BundleTracker({path: __dirname, filename: './webpack-stats.json', integrity: true}),
new BundleTracker({path: __dirname, filename: 'webpack-stats.json', integrity: true}),
],

module: {
Expand Down
2 changes: 1 addition & 1 deletion tests/webpack.config.simple.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = {

plugins: [
new MiniCssExtractPlugin(),
new BundleTracker({path: __dirname, filename: './webpack-stats.json'}),
new BundleTracker({path: __dirname, filename: 'webpack-stats.json'}),
],

module: {
Expand Down
2 changes: 1 addition & 1 deletion tests/webpack.config.skipCommon.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = {

plugins: [
new MiniCssExtractPlugin(),
new BundleTracker({path: __dirname, filename: './webpack-stats.json'}),
new BundleTracker({path: __dirname, filename: 'webpack-stats.json'}),
],

module: {
Expand Down
2 changes: 1 addition & 1 deletion tests/webpack.config.sourcemaps.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = {

plugins: [
new MiniCssExtractPlugin(),
new BundleTracker({path: __dirname, filename: './webpack-stats.json'}),
new BundleTracker({path: __dirname, filename: 'webpack-stats.json'}),
],

module: {
Expand Down
2 changes: 1 addition & 1 deletion tests/webpack.config.split.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = {

plugins: [
new MiniCssExtractPlugin(),
new BundleTracker({path: __dirname, filename: './webpack-stats.json'}),
new BundleTracker({path: __dirname, filename: 'webpack-stats.json'}),
],

module: {
Expand Down

0 comments on commit 0c0ff26

Please sign in to comment.