Merge pull request #8 from octue/update-ci-names

Update workflow names
octue · Oct 24, 2023 · 759ee17 · 759ee17
2 parents 4fa7141 + 45eef0c
commit 759ee17
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -1,3 +1,5 @@
+name: cd
+
 # Only trigger when a pull request into main branch is merged
 on:
   pull_request:
@@ -9,7 +11,7 @@ on:
 jobs:
   publish:
     # This job will only run if the PR has been merged (and not closed without merging).
-    if: "github.event.pull_request.merged == true"
+    if: 'github.event.pull_request.merged == true'
     permissions:
       id-token: write
       contents: read

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -9,7 +9,7 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: 'CodeQL'
+name: codeql
 
 on:
   push:

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Octue
+Copyright (c) 2023 Octue Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
 [![PyPI version](https://badge.fury.io/py/django-svelte-jsoneditor.svg)](https://badge.fury.io/py/django-svelte-jsoneditor)
-[![Release](https://github.com/octue/django-svelte-jsoneditor/actions/workflows/release.yml/badge.svg)](https://github.com/octue/django-svelte-jsoneditor/actions/workflows/release.yml)
 [![Documentation Status](https://readthedocs.org/projects/django-svelte-jsoneditor/badge/?version=latest)](https://django-svelte-jsoneditor.readthedocs.io/en/latest/?badge=latest)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-svelte-jsoneditor"
-version = "0.1.0"
+version = "0.1.1"
 description = "A widget for django's JSONField using the latest-and-greatest Json Editor"
 authors = ["Tom Clark <tom@octue.com>"]
 license = "MIT"

diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,11 @@
 [tox]
-envlist = {py39,py310,py311}-dj{32,41}-{sqlite,postgres}
+envlist = {py39,py310,py311}-dj{32,42}-{sqlite,postgres}
 isolated_build = True
 
 [testenv]
 whitelist_externals = poetry
 setenv =
-    DJANGO_SETTINGS_MODULE=tests.server.settings_ci
+    DJANGO_SETTINGS_MODULE=tests.server.settings
     PYTHONPATH = {toxinidir}:{toxinidir}/django_svelte_jsoneditor
     sqlite: DATABASE_ENGINE=sqlite
     postgres: DATABASE_ENGINE=postgres
@@ -15,7 +15,7 @@ commands =
     coverage xml
 deps =
     dj32: Django>=3.2,<3.3
-    dj41: Django>=4.1,<4.2
+    dj42: Django>=4.2,<4.3
     postgres: psycopg2
 
 [gh-actions]