Skip to content

Fix tests compatibility #348

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

Merged
merged 1 commit into from
May 22, 2023
Merged

Fix tests compatibility #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 19 additions & 20 deletions .circleci/config.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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