Skip to content

Commit d6caf92

Browse files
markswebmarksweb
authored
Release 3.0 (#441)
* Bump version: 2.0.2 → 3.0.0 * Drop django 3.0 * Drop python 3.5 and 3.6. Added Python 3.9 and 3.10
1 parent d4346a3 commit d6caf92

17 files changed

+246
-90
lines changed

‎.github/workflows/publish-to-live-pypi.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Publish Python 🐍 distributions 📦 to pypi
2+
3+
on:
4+
release:
5+
types:
6+
- published
7+
8+
jobs:
9+
build-n-publish:
10+
name: Build and publish Python 🐍 distributions 📦 to pypi
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@master
14+
- name: Set up Python 3.9
15+
uses: actions/setup-python@v1
16+
with:
17+
python-version: 3.9
18+
19+
- name: Install pypa/build
20+
run: >-
21+
python -m
22+
pip install
23+
build
24+
--user
25+
- name: Build a binary wheel and a source tarball
26+
run: >-
27+
python -m
28+
build
29+
--sdist
30+
--wheel
31+
--outdir dist/
32+
.
33+
34+
- name: Publish distribution 📦 to PyPI
35+
if: startsWith(github.ref, 'refs/tags')
36+
uses: pypa/gh-action-pypi-publish@master
37+
with:
38+
user: __token__
39+
password: ${{ secrets.PYPI_API_TOKEN }}

‎.github/workflows/publish-to-test-pypi.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Publish Python 🐍 distributions 📦 to TestPyPI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
build-n-publish:
10+
name: Build and publish Python 🐍 distributions 📦 to TestPyPI
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@master
14+
- name: Set up Python 3.9
15+
uses: actions/setup-python@v1
16+
with:
17+
python-version: 3.9
18+
19+
- name: Install pypa/build
20+
run: >-
21+
python -m
22+
pip install
23+
build
24+
--user
25+
- name: Build a binary wheel and a source tarball
26+
run: >-
27+
python -m
28+
build
29+
--sdist
30+
--wheel
31+
--outdir dist/
32+
.
33+
34+
- name: Publish distribution 📦 to Test PyPI
35+
uses: pypa/gh-action-pypi-publish@master
36+
with:
37+
user: __token__
38+
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
39+
repository_url: https://test.pypi.org/legacy/
40+
skip_existing: true

‎.github/workflows/screenshots.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
python-version: [3.6] # dockerfile uses 3.6
12-
django-version: [
13-
'2.2',
14-
'3.0', # Strings because otherwise 3.0 becomes 3
15-
'3.1'
16-
]
11+
python-version: [3.8] # dockerfile uses 3.8
12+
django-version: ['2.2', '3.1']
1713
os: [
1814
ubuntu-20.04,
1915
]

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
python-version: [ 3.6, 3.7, 3.8, 3.9, ]
11+
python-version: [ '3.7', '3.8', '3.9', '3.10']
1212
requirements-file: [
1313
django-2.2.txt,
1414
django-3.0.txt,
15-
django-3.1.txt # Testing against 3.6 here as the lowest supported
15+
django-3.1.txt
1616
]
1717
os: [
1818
ubuntu-20.04,

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*.log
55
*.pot
66
.DS_Store
7-
.coverage/
7+
.coverage
88
.eggs/
99
.idea/
1010
.project/

‎.pre-commit-config.yaml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
repos:
2+
- repo: https://github.com/asottile/pyupgrade
3+
rev: v2.31.0
4+
hooks:
5+
- id: pyupgrade
6+
args: ["--py37-plus"]
7+
8+
- repo: https://github.com/adamchainz/django-upgrade
9+
rev: '1.4.0'
10+
hooks:
11+
- id: django-upgrade
12+
args: [--target-version, "2.2"]
13+
14+
- repo: https://github.com/PyCQA/flake8
15+
rev: 4.0.1
16+
hooks:
17+
- id: flake8
18+
19+
- repo: https://github.com/asottile/yesqa
20+
rev: v1.3.0
21+
hooks:
22+
- id: yesqa
23+
24+
- repo: https://github.com/pre-commit/pre-commit-hooks
25+
rev: v4.1.0
26+
hooks:
27+
- id: check-merge-conflict
28+
- id: mixed-line-ending
29+
30+
- repo: https://github.com/pycqa/isort
31+
rev: 5.10.1
32+
hooks:
33+
- id: isort

‎CHANGELOG.rst‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22
Changelog
33
=========
44

5-
Unreleased
6-
==================
5+
unreleased
6+
==========
7+
8+
3.0.0 2022-01-22
9+
================
710

11+
* Drop support for python 3.5, 3.6 and django 3.0
12+
* Increase calendar box width to show Sundays
813
* Fix datetime fields layout
914
* Fix modal layout issue
1015
* Improve readability in form

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.6.6
1+
FROM python:3.8.12
22

33
# Pillow requirements
44
RUN apt-get update \
@@ -7,7 +7,7 @@ RUN apt-get update \
77
build-essential
88

99
# Node setup
10-
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
10+
RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash -
1111
RUN apt-get install -y nodejs npm
1212
RUN npm install -g gulp@3
1313

‎Dockerfile.django-3.0‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎README.rst‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ django CMS Admin Style
77
Adds pretty CSS styles for the django CMS admin interface.
88

99

10-
.. note::
10+
.. note::
1111

1212
This project is considered 3rd party (no supervision by the `django CMS Association <https://www.django-cms.org/en/about-us/>`_). Join us on `Slack <https://www.django-cms.org/slack/>`_ for more information.
1313

@@ -25,8 +25,8 @@ Contribute to this project and win rewards
2525

2626
Because this is a an open-source project, we welcome everyone to
2727
`get involved in the project <https://www.django-cms.org/en/contribute/>`_ and
28-
`receive a reward <https://www.django-cms.org/en/bounty-program/>`_ for their contribution.
29-
Become part of a fantastic community and help us make django CMS the best CMS in the world.
28+
`receive a reward <https://www.django-cms.org/en/bounty-program/>`_ for their contribution.
29+
Become part of a fantastic community and help us make django CMS the best CMS in the world.
3030

3131
We'll be delighted to receive your
3232
feedback in the form of issues and pull requests. Before submitting your
@@ -110,10 +110,10 @@ djangocms-casper-helpers.
110110

111111
.. |pypi| image:: https://badge.fury.io/py/djangocms-admin-style.svg
112112
:target: http://badge.fury.io/py/djangocms-admin-style
113-
.. |build| image:: https://travis-ci.org/divio/djangocms-admin-style.svg?branch=master
114-
:target: https://travis-ci.org/divio/djangocms-admin-style
115-
.. |coverage| image:: https://codecov.io/gh/divio/djangocms-admin-style/branch/master/graph/badge.svg
116-
:target: https://codecov.io/gh/divio/djangocms-admin-style
113+
.. |build| image:: https://travis-ci.org/django-cms/djangocms-admin-style.svg?branch=master
114+
:target: https://travis-ci.org/django-cms/djangocms-admin-style
115+
.. |coverage| image:: https://codecov.io/gh/django-cms/djangocms-admin-style/branch/master/graph/badge.svg
116+
:target: https://codecov.io/gh/django-cms/djangocms-admin-style
117117

118118
.. |python| image:: https://img.shields.io/badge/python-3.5+-blue.svg
119119
:target: https://pypi.org/project/djangocms-admin-style/

0 commit comments

Comments
 (0)