Skip to content

Commit

Permalink
Merge branch 'stephenmcd:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
molokov authored Dec 18, 2023
2 parents 9b43cc4 + e719286 commit c98e2d8
Show file tree
Hide file tree
Showing 245 changed files with 35,887 additions and 5,663 deletions.
7 changes: 7 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[run]
omit =
mezzanine/*/migrations/*
*/tests/*

[report]
show_missing = True
57 changes: 57 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Bug Report
description: File a bug/issue
title: "[BUG] <title>"
labels: [bug, needs triage]

body:
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered
options:
- label: I have searched the existing Issues
required: true
- type: textarea
attributes:
label: Current Behavior
description: A concise description of the problem you're experiencing
validations:
required: true
- type: textarea
attributes:
label: Expected Behavior
description: A concise description of what you expected to happen
validations:
required: true
- type: textarea
attributes:
label: Steps To Reproduce
description: Steps to reproduce the behavior
placeholder: |
1. In this environment...
2. With this config...
3. Run '...'
4. See error...
validations:
required: true
- type: textarea
attributes:
label: Environment
value: |
- Operating System:
- Python version:
- Django version:
- Database engine and version:
- Mezzanine version:
render: markdown
validations:
required: true
- type: textarea
attributes:
label: Anything else?
description: |
Links? References? Anything that will give us more context about the issue you are encountering!
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: General Support and Questions
url: https://github.com/stephenmcd/mezzanine/discussions/new
about: Ask for help from the Mezzanine community
40 changes: 40 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Feature Request
description: Request a new feature
title: "[REQUEST] <title>"
labels: [feature request, needs triage]

body:
- type: checkboxes
attributes:
label: Is there an existing request for this?
description: Please search to see if a request already exists for the feature you want
options:
- label: I have searched the existing Issues
required: true
- type: textarea
attributes:
label: Current problem or need
description: A concise description of what the problem is. Ex. I'm always frustrated when [...]
validations:
required: true
- type: textarea
attributes:
label: Desired solution
description: A concise description of what you want to happen
validations:
required: true
- type: textarea
attributes:
label: Alternatives you have considered
description: A concise description of any alternative solutions or features you've considered
validations:
required: false
- type: textarea
attributes:
label: Anything else?
description: |
Links? References? Anything that will give us more context about the issue you are encountering!
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
142 changes: 142 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
name: Test and release

# Fires on all incoming commits
on:
pull_request:
push:

jobs:

# Test all supported Python & Django versions
test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
# Django 2.2
- tox-env: "py37-dj22"
python-version: "3.7"
- tox-env: "py38-dj22"
python-version: "3.8"
- tox-env: "py39-dj22"
python-version: "3.9"
# Django 3.0
- tox-env: "py37-dj30"
python-version: "3.7"
- tox-env: "py38-dj30"
python-version: "3.8"
- tox-env: "py39-dj30"
python-version: "3.9"
# Django 3.1
- tox-env: "py37-dj31"
python-version: "3.7"
- tox-env: "py38-dj31"
python-version: "3.8"
- tox-env: "py39-dj31"
python-version: "3.9"
# Django 3.2
- tox-env: "py37-dj32"
python-version: "3.7"
- tox-env: "py38-dj32"
python-version: "3.8"
- tox-env: "py39-dj32"
python-version: "3.9"
- tox-env: "py310-dj32"
python-version: "3.10"
# Django 4.0
- tox-env: "py38-dj40"
python-version: "3.8"
- tox-env: "py39-dj40"
python-version: "3.9"
- tox-env: "py310-dj40"
python-version: "3.10"
# Django 4.1
- tox-env: "py38-dj41"
python-version: "3.8"
- tox-env: "py39-dj41"
python-version: "3.9"
- tox-env: "py310-dj41"
python-version: "3.10"

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: pip install -U pip tox
- name: Run tests
run: tox -e ${{ matrix.tox-env }}
- name: Publish Test Report
uses: mikepenz/action-junit-report@v3
with:
report_paths: '**/junit/TEST-*.xml'

# Lint
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: 3.9
- name: Install dependencies
run: pip install tox -U pip
- name: Lint
run: tox -e package -e lint -e pyupgrade

# Create a new semantic release
# Only runs on the original repo, not forks
release:
if: github.repository_owner == 'stephenmcd'
needs: [test, lint]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: 3.9
- uses: actions/setup-node@v3
- uses: cycjimmy/semantic-release-action@v3
with:
semantic_version: 18
extra_plugins: |
@semantic-release/exec@6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}

# Build and deploy docs
docs:
if: github.ref == 'refs/heads/stable'
needs: release
name: build and deploy docs
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: 3.9
- name: Install deps
run: pip install -e . && pip install sphinx
- uses: actions-ecosystem/action-get-latest-tag@v1
id: get-latest-tag
with:
semver_only: true
- name: Get release tag
run: echo "RELEASE_TAG=${{ steps.get-latest-tag.outputs.tag }}" >> $GITHUB_ENV
- name: Build docs
run: sphinx-build -b html docs docs/build
- name: Deploy to GitHub Pages
if: success()
uses: crazy-max/ghaction-github-pages@v2
with:
target_branch: gh-pages
build_dir: docs/build
fqdn: mezzanine.jupo.org
jekyll: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,18 @@
.DS_Store
.coverage
.idea/
.pytest_cache
junit/
local_settings.py
.eggs/
.tox/
.venv/
Mezzanine.egg-info/
build/
docs/build/
docs/_build/
dist/
htmlcov/
mezzanine/project_template/static/
/mezzanine/.project
/mezzanine/.pydevproject
2 changes: 2 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[settings]
profile = black
19 changes: 19 additions & 0 deletions .releaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"branches": [
"+([0-9])?(.{+([0-9]),x}).x",
"stable",
{"name": "alpha", "prerelease": true},
{"name": "beta", "prerelease": true},
{"name": "rc", "prerelease": true}
],
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
"@semantic-release/github",
["@semantic-release/exec", {
"verifyConditionsCmd": "python -m pip install -U pip setuptools wheel twine",
"prepareCmd": "sed -i 's/9999dev0/${nextRelease.version}/' mezzanine/__init__.py",
"publishCmd": "python setup.py sdist bdist_wheel && twine upload dist/*"
}]
]
}
28 changes: 0 additions & 28 deletions .travis.yml

This file was deleted.

1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -279,3 +279,4 @@
* Geoffrey Royer
* Chris Hawes
* Andrii Soldatenko
* Christian Kuper
7 changes: 6 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 5.0 and newer
---------------------

Please refer to the `GitHub Releases Page <https://github.com/stephenmcd/mezzanine/releases>`_.

Version 4.3.1 (Aug 08, 2018)
----------------------------

Expand Down Expand Up @@ -30,7 +35,7 @@ Version 4.3.0 (Jun 15, 2018)
* Don't warn Mezzanine about itself - Stephen McDonald
* Looser check for LocalMiddleware. Closes #1621 - Stephen McDonald
* Modified the blog homepage pattern to a working version. Added import it requires - Ville Ranki
* Remove explicit ``show_banner`` argument from ``inner_run``. This broke --noreload for me. When called from ``https://github.com/django/django/blob/master/django/core/management/commands/runserver.py#L107``, if **options contains a ``show_banner`` arg (which, seemingly, is set just above in ``add_arguments)``, this throws a "Got multiple values for argument" TypeError - Kevin Shen
* Remove explicit ``show_banner`` argument from ``inner_run``. This broke --noreload for me. When called from ``https://github.com/django/django/blob/master/django/core/management/commands/runserver.py#L107``, if ``**options`` contains a ``show_banner`` arg (which, seemingly, is set just above in ``add_arguments``), this throws a "Got multiple values for argument" TypeError - Kevin Shen
* Handle ``MIDDLEWARE_CLASSES`` -> MIDDLEWARE - Stephen McDonald
* Don't use lazy static loading when Django's ManifestStaticFilesStorage is configured. Closes #1772 - Stephen McDonald
* Link to Pillow docs for dependencies - Stephen McDonald
Expand Down
Loading

0 comments on commit c98e2d8

Please sign in to comment.