diff --git a/.github/workflows/screenshots.yml b/.github/workflows/screenshots.yml index dfc5d05b..a389e5ac 100644 --- a/.github/workflows/screenshots.yml +++ b/.github/workflows/screenshots.yml @@ -8,8 +8,8 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8] # dockerfile uses 3.8 - django-version: ['2.2', '3.1'] + python-version: [3.9] # dockerfile uses 3.8 + django-version: ['2.2', '3.2'] os: [ ubuntu-20.04, ] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b2af5db1..8ffe98f0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,11 +8,11 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ '3.7', '3.8', '3.9', '3.10'] + python-version: [ '3.8', '3.9', '3.10', '3.11'] requirements-file: [ django-2.2.txt, - django-3.0.txt, - django-3.1.txt + django-3.2.txt, + django-4.1.txt ] os: [ ubuntu-20.04, diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0d06a93a..86d0b034 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ Changelog unreleased ========== +* Check updates based on pypi release * Removed unused css generating conflicts for icons fonts of djangocms-admin-style and django-cms core. diff --git a/Dockerfile.django-3.1 b/Dockerfile.django-3.1 deleted file mode 100644 index 00fd45a1..00000000 --- a/Dockerfile.django-3.1 +++ /dev/null @@ -1,7 +0,0 @@ -FROM djangocms-admin-style-test:base - -RUN pip install -r /app/tests/requirements/django-3.1.txt - -ENV SCREENSHOT_REFERENCES="./tests/screenshots/reference-3.1" - -COPY . /app diff --git a/Dockerfile.django-3.2 b/Dockerfile.django-3.2 new file mode 100644 index 00000000..313a6017 --- /dev/null +++ b/Dockerfile.django-3.2 @@ -0,0 +1,7 @@ +FROM djangocms-admin-style-test:base + +RUN pip install -r /app/tests/requirements/django-3.2.txt + +ENV SCREENSHOT_REFERENCES="./tests/screenshots/reference-3.2" + +COPY . /app diff --git a/README.rst b/README.rst index 802df8e5..6f9119bb 100644 --- a/README.rst +++ b/README.rst @@ -44,7 +44,8 @@ Documentation See ``REQUIREMENTS`` in the `setup.py `_ file for additional dependencies: -|python| |django| |djangocms| +|python| |django| |djangocms| |djangocms4| + Installation @@ -118,7 +119,9 @@ djangocms-casper-helpers. .. |python| image:: https://img.shields.io/badge/python-3.5+-blue.svg :target: https://pypi.org/project/djangocms-admin-style/ -.. |django| image:: https://img.shields.io/badge/django-2.2,%203.0,%203.1-blue.svg +.. |django| image:: https://img.shields.io/badge/django-2.2%2B-blue.svg :target: https://www.djangoproject.com/ .. |djangocms| image:: https://img.shields.io/badge/django%20CMS-3.6%2B-blue.svg :target: https://www.django-cms.org/ +.. |djangocms4| image:: https://img.shields.io/badge/django%20CMS-4-blue.svg + :target: https://www.django-cms.org/ diff --git a/djangocms_admin_style/static/djangocms_admin_style/js/dist/bundle.adminstyle.min.js b/djangocms_admin_style/static/djangocms_admin_style/js/dist/bundle.adminstyle.min.js index 3aa7c899..45e32f6e 100644 --- a/djangocms_admin_style/static/djangocms_admin_style/js/dist/bundle.adminstyle.min.js +++ b/djangocms_admin_style/static/djangocms_admin_style/js/dist/bundle.adminstyle.min.js @@ -1 +1 @@ -!function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var n={};t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=1)}([function(e,t,n){var r,o;!function(t,n){"object"==typeof e&&"object"==typeof e.exports?e.exports=t.document?n(t,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return n(e)}:n(t)}("undefined"!=typeof window?window:this,function(i,a){function s(e){var t="length"in e&&e.length,n=le.type(e);return"function"!==n&&!le.isWindow(e)&&(!(1!==e.nodeType||!t)||("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e))}function u(e,t,n){if(le.isFunction(t))return le.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return le.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(ve.test(t))return le.filter(t,e,n);t=le.filter(t,e)}return le.grep(e,function(e){return le.inArray(e,t)>=0!==n})}function l(e,t){do{e=e[t]}while(e&&1!==e.nodeType);return e}function c(e){var t=Ee[e]={};return le.each(e.match(Ce)||[],function(e,n){t[n]=!0}),t}function d(){xe.addEventListener?(xe.removeEventListener("DOMContentLoaded",f,!1),i.removeEventListener("load",f,!1)):(xe.detachEvent("onreadystatechange",f),i.detachEvent("onload",f))}function f(){(xe.addEventListener||"load"===event.type||"complete"===xe.readyState)&&(d(),le.ready())}function p(e,t,n){if(void 0===n&&1===e.nodeType){var r="data-"+t.replace(De,"-$1").toLowerCase();if("string"==typeof(n=e.getAttribute(r))){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:je.test(n)?le.parseJSON(n):n)}catch(e){}le.data(e,t,n)}else n=void 0}return n}function h(e){var t;for(t in e)if(("data"!==t||!le.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function m(e,t,n,r){if(le.acceptData(e)){var o,i,a=le.expando,s=e.nodeType,u=s?le.cache:e,l=s?e[a]:e[a]&&a;if(l&&u[l]&&(r||u[l].data)||void 0!==n||"string"!=typeof t)return l||(l=s?e[a]=Z.pop()||le.guid++:a),u[l]||(u[l]=s?{}:{toJSON:le.noop}),("object"==typeof t||"function"==typeof t)&&(r?u[l]=le.extend(u[l],t):u[l].data=le.extend(u[l].data,t)),i=u[l],r||(i.data||(i.data={}),i=i.data),void 0!==n&&(i[le.camelCase(t)]=n),"string"==typeof t?null==(o=i[t])&&(o=i[le.camelCase(t)]):o=i,o}}function g(e,t,n){if(le.acceptData(e)){var r,o,i=e.nodeType,a=i?le.cache:e,s=i?e[le.expando]:le.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){le.isArray(t)?t=t.concat(le.map(t,le.camelCase)):t in r?t=[t]:(t=le.camelCase(t),t=t in r?[t]:t.split(" ")),o=t.length;for(;o--;)delete r[t[o]];if(n?!h(r):!le.isEmptyObject(r))return}(n||(delete a[s].data,h(a[s])))&&(i?le.cleanData([e],!0):se.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}function v(){return!0}function y(){return!1}function x(){try{return xe.activeElement}catch(e){}}function b(e){var t=Pe.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function w(e,t){var n,r,o=0,i=typeof e.getElementsByTagName!==Se?e.getElementsByTagName(t||"*"):typeof e.querySelectorAll!==Se?e.querySelectorAll(t||"*"):void 0;if(!i)for(i=[],n=e.childNodes||e;null!=(r=n[o]);o++)!t||le.nodeName(r,t)?i.push(r):le.merge(i,w(r,t));return void 0===t||t&&le.nodeName(e,t)?le.merge([e],i):i}function T(e){Me.test(e.type)&&(e.defaultChecked=e.checked)}function C(e,t){return le.nodeName(e,"table")&&le.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function E(e){return e.type=(null!==le.find.attr(e,"type"))+"/"+e.type,e}function N(e){var t=Ge.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function k(e,t){for(var n,r=0;null!=(n=e[r]);r++)le._data(n,"globalEval",!t||le._data(t[r],"globalEval"))}function S(e,t){if(1===t.nodeType&&le.hasData(e)){var n,r,o,i=le._data(e),a=le._data(t,i),s=i.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,o=s[n].length;o>r;r++)le.event.add(t,n,s[n][r])}a.data&&(a.data=le.extend({},a.data))}}function j(e,t){var n,r,o;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!se.noCloneEvent&&t[le.expando]){o=le._data(t);for(r in o.events)le.removeEvent(t,r,o.handle);t.removeAttribute(le.expando)}"script"===n&&t.text!==e.text?(E(t).text=e.text,N(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),se.html5Clone&&e.innerHTML&&!le.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Me.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function D(e,t){var n,r=le(t.createElement(e)).appendTo(t.body),o=i.getDefaultComputedStyle&&(n=i.getDefaultComputedStyle(r[0]))?n.display:le.css(r[0],"display");return r.detach(),o}function A(e){var t=xe,n=rt[e];return n||(n=D(e,t),"none"!==n&&n||(nt=(nt||le("