From 5b9df0494b21a4da5c2f4c1bb5cb65efbb212a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sandstr=C3=B6m?= Date: Tue, 4 Jan 2022 12:19:03 +0100 Subject: [PATCH 01/12] Rename deploy step to publish --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bd408f2..c1e09e5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,6 +26,7 @@ jobs: - name: Test run: | python runtests.py + lint-black: runs-on: ubuntu-latest needs: test @@ -36,6 +37,7 @@ jobs: options: "--check --verbose" src: "." version: "21.5b1" + lint-isort: runs-on: ubuntu-latest needs: test @@ -49,7 +51,8 @@ jobs: python -m pip install --upgrade pip pip install isort isort . --check-only - deploy: + + publish: runs-on: ubuntu-latest needs: [test, lint-black, lint-isort] steps: From d60c9083dbd62adc177f5bea30885372f21cd29b Mon Sep 17 00:00:00 2001 From: code-review-doctor Date: Tue, 15 Feb 2022 16:50:47 +0000 Subject: [PATCH 02/12] Fix issue avoid-misusing-assert-true found at https://codereview.doctor --- django_react_templatetags/tests/test_ssr_hypernova_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_react_templatetags/tests/test_ssr_hypernova_service.py b/django_react_templatetags/tests/test_ssr_hypernova_service.py index 671801c..d768659 100644 --- a/django_react_templatetags/tests/test_ssr_hypernova_service.py +++ b/django_react_templatetags/tests/test_ssr_hypernova_service.py @@ -202,7 +202,7 @@ def test_only_ssr_html_are_returned_on_no_placeholder(self, mocked): ).render(self.mocked_context) queue = self.mocked_context["REACT_COMPONENTS"] - self.assertTrue(len(queue), 1) + self.assertEqual(len(queue), 1) self.assertFalse(out.startswith('
Date: Fri, 22 Jul 2022 16:58:33 +0200 Subject: [PATCH 04/12] Update black in github actions --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c1e09e5..9aabd80 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ jobs: with: options: "--check --verbose" src: "." - version: "21.5b1" + version: "22.3.0" lint-isort: runs-on: ubuntu-latest From 0317beeb2475e284029244c968f1450bf8b254c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sandstr=C3=B6m?= Date: Fri, 22 Jul 2022 17:01:14 +0200 Subject: [PATCH 05/12] Fix formatting issues raised by black --- django_react_templatetags/templatetags/react.py | 2 +- django_react_templatetags/tests/test_filters.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/django_react_templatetags/templatetags/react.py b/django_react_templatetags/templatetags/react.py index 1440a79..ee96d3f 100755 --- a/django_react_templatetags/templatetags/react.py +++ b/django_react_templatetags/templatetags/react.py @@ -185,7 +185,7 @@ def props_to_json(resolved_data, context): @staticmethod def render_placeholder(attributes, component_html=""): attr_pairs = map(lambda x: '{}="{}"'.format(*x), attributes) - return u"
{}
".format( + return "
{}
".format( " ".join(attr_pairs), component_html, ) diff --git a/django_react_templatetags/tests/test_filters.py b/django_react_templatetags/tests/test_filters.py index 3d51ccf..9143b58 100644 --- a/django_react_templatetags/tests/test_filters.py +++ b/django_react_templatetags/tests/test_filters.py @@ -251,7 +251,7 @@ def test_to_model_representation_data(self): def test_unicode_chars(self): "Tests that the data is added as correct json into the react render" - self.mocked_context["component_data"] = {"name": u"ÅÄÖ"} + self.mocked_context["component_data"] = {"name": "ÅÄÖ"} out = Template( "{% load react %}" From 6e798167e1ce18c6ff93b485d4239f7143d5ee69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sandstr=C3=B6m?= Date: Sat, 7 Jan 2023 08:05:17 +0100 Subject: [PATCH 06/12] Bump year in license --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 72233bf..77ff799 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2022 Fröjd Interactive +Copyright (c) 2015-2023 Fröjd Interactive Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 44088e400c9dd3c4acefce77584a173c6553ce69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sandstr=C3=B6m?= Date: Sat, 7 Jan 2023 08:07:52 +0100 Subject: [PATCH 07/12] Include python 3.11 and django 4.1 in CI test runner --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9aabd80..2c94202 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,11 +8,13 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10"] - django: ["3.2", "4.0"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + django: ["3.2", "4.0", "4.1"] exclude: - python-version: "3.7" django: "4.0" + - python-version: "3.7" + django: "4.1" steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} From 86b92306a69c79d69ba1a91e529abb6938e1ffd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sandstr=C3=B6m?= Date: Sat, 7 Jan 2023 08:56:40 +0100 Subject: [PATCH 08/12] Add library changelog --- CHANGELOG.md | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..8b216cb --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,113 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Added +- Add changelog + +### Changed +### Fixed +- Add python 3.11 support (@marteinn) +- Add django 4.1 support (@marteinn) +- Fix invalid assert (code-review-doctor) + +### Removed + +## [7.0.0] - 2022-01-04 + +### Fixed +- Add Django 4.0 support +- Add Python 3.10 support + +### Removed +- Drop Python 2 support +- Drop Python 3.6 support +- Drop support for EOL versions of Django (1 and 2) + +## [6.0.2] - 2020-09-05 + +### Fixed + - Make context_processor mandatory again + +## [6.0.1] - 2020-08-30 + +### Fixed +- Solved XSS issue (@anthonynsimon, @marteinn) +- Add security policy + +## [6.0.0] - 2020-04-28 + +### Added +- Add official support for Hypernova SSR service +- Add attribute “no_placeholder” when you want to skip the DRTT provided placeholder + +### Fixed +- Add official Django 3 support (@niespodd, @marteinn) +- Remove context_processor required to run library (@niespodd) +- Solve issue with requests import (Aria Moradi) +- Use unit.patch instead of responses to mock requests (Umair) + +### Removed +- Drop Django 1 support +- Drop pypy support + + +## [5.4.0] - 2019-04-28 + +### Added +- Make it possible to use your own SSRService + +### Fixed +- Update docs +- Add project logo + +## [5.3.0] - 2019-04-24 + +### Added +- Add SSRContext for passign values to SSR (@mikaelengstrom, @marteinn) +- Add support for disabling SSR using header HTTP_X_DISABLE_SSR + +### Fixed +- Include example project +- Drop python 3.4 support + +## [5.2.1] - 2018-08-10 + +### Fixed +- Add better SSR errors (thanks @mikaelengstrom) + +## [5.2.0] - 2018-08-09 + +### Fixed +- Use render() if SSR is not available +- Fix bug when passing in standalone primitives in react_render +- Update docs + +## [5.1.0] - 2018-05-22 + +### Added +- Add support for a replaceable tag manager (@aleehedl) +- Add configurable headers for SSR (@aleehedl, @marteinn) + +## [5.1.0] - 2018-04-05 + +### Fixed +- Update react requirements in readme +- Change NotImplemented error to to_react_representation + +### Removed +- Drop django support for django 1.10 and below +- Drop custom JSON serializer + +## [4.0.0] - 2017-12-06 + +### Fixed +- Solved bug where to_react_representation triggered twice under SSR + +### Removed +- Dropped support for django 1.8 +- Removed templatetags for filters From 19440923d84af212db7e8054b9e9fc8837ec28ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sandstr=C3=B6m?= Date: Sat, 7 Jan 2023 09:00:14 +0100 Subject: [PATCH 09/12] Drop unused imports --- django_react_templatetags/ssr/hypernova.py | 1 - django_react_templatetags/tests/test_representation_mixin.py | 2 +- django_react_templatetags/tests/test_ssr.py | 3 --- django_react_templatetags/tests/test_ssr_hypernova_service.py | 1 - setup.py | 2 -- 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/django_react_templatetags/ssr/hypernova.py b/django_react_templatetags/ssr/hypernova.py index 4e375b9..001e614 100644 --- a/django_react_templatetags/ssr/hypernova.py +++ b/django_react_templatetags/ssr/hypernova.py @@ -1,4 +1,3 @@ -import json import logging import re diff --git a/django_react_templatetags/tests/test_representation_mixin.py b/django_react_templatetags/tests/test_representation_mixin.py index 42310d1..0f1692e 100644 --- a/django_react_templatetags/tests/test_representation_mixin.py +++ b/django_react_templatetags/tests/test_representation_mixin.py @@ -1,4 +1,4 @@ -from django.test import SimpleTestCase, override_settings +from django.test import SimpleTestCase from django_react_templatetags.mixins import RepresentationMixin diff --git a/django_react_templatetags/tests/test_ssr.py b/django_react_templatetags/tests/test_ssr.py index e0eeb19..9a2e28e 100644 --- a/django_react_templatetags/tests/test_ssr.py +++ b/django_react_templatetags/tests/test_ssr.py @@ -3,12 +3,9 @@ except ImportError: import mock -from django.template import Context, Template from django.test import SimpleTestCase, override_settings from django.urls import reverse -from django_react_templatetags.tests.demosite.models import MovieWithContext, Person - class CustomSSRService: "Used for testing using a custom ssr service" diff --git a/django_react_templatetags/tests/test_ssr_hypernova_service.py b/django_react_templatetags/tests/test_ssr_hypernova_service.py index d768659..b3c173f 100644 --- a/django_react_templatetags/tests/test_ssr_hypernova_service.py +++ b/django_react_templatetags/tests/test_ssr_hypernova_service.py @@ -1,4 +1,3 @@ -import json import logging from .mock_response import MockResponse diff --git a/setup.py b/setup.py index 08c8a4f..caae1c8 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,7 @@ #!/usr/bin/env python import io -import os import re -import sys from pathlib import Path from setuptools import find_packages, setup From 2586924718337c50647317c2f375686c5f0e0d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sandstr=C3=B6m?= Date: Sat, 7 Jan 2023 09:01:33 +0100 Subject: [PATCH 10/12] Drop redundant utf8 header --- django_react_templatetags/tests/test_manager.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/django_react_templatetags/tests/test_manager.py b/django_react_templatetags/tests/test_manager.py index d6da683..a4bda73 100644 --- a/django_react_templatetags/tests/test_manager.py +++ b/django_react_templatetags/tests/test_manager.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - from django.template import Context, Template from django.test import SimpleTestCase, override_settings From 94793340bc6b31528cce064aad90d5de740513b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sandstr=C3=B6m?= Date: Sat, 7 Jan 2023 09:03:22 +0100 Subject: [PATCH 11/12] Update project classifiers --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index caae1c8..b422af3 100644 --- a/setup.py +++ b/setup.py @@ -54,9 +54,11 @@ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Framework :: Django", "Framework :: Django :: 3.2", "Framework :: Django :: 4.0", + "Framework :: Django :: 4.1", "Topic :: Utilities", "Programming Language :: JavaScript", ], From 6f6dcde75a8b521dceb0cd64dfae4b320d3e17ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sandstr=C3=B6m?= Date: Sat, 7 Jan 2023 09:05:13 +0100 Subject: [PATCH 12/12] Bump version to 7.0.1 --- CHANGELOG.md | 10 +++++++--- django_react_templatetags/__init__.py | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b216cb..0a900dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,17 +6,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added +### Changed +### Fixed +### Removed + +## [7.0.1] - 2023-01-07 + ### Added - Add changelog -### Changed ### Fixed - Add python 3.11 support (@marteinn) - Add django 4.1 support (@marteinn) - Fix invalid assert (code-review-doctor) -### Removed - ## [7.0.0] - 2022-01-04 ### Fixed diff --git a/django_react_templatetags/__init__.py b/django_react_templatetags/__init__.py index cb7b83b..52afb93 100644 --- a/django_react_templatetags/__init__.py +++ b/django_react_templatetags/__init__.py @@ -7,8 +7,8 @@ """ __title__ = "django_react_templatetags" -__version__ = "7.0.0" -__build__ = 700 +__version__ = "7.0.1" +__build__ = 701 __author__ = "Martin Sandström" __license__ = "MIT" -__copyright__ = "Copyright 2015-2021 Fröjd Interactive" +__copyright__ = "Copyright 2015-2022 Fröjd Interactive"