Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: codingjoe/django-stdimage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.0.6
Choose a base ref
...
head repository: codingjoe/django-stdimage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
2 changes: 2 additions & 0 deletions .bandit
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[bandit]
exclude: ./tests
26 changes: 26 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# http://editorconfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
max_line_length = 88

[*.py]
indent_style = space
indent_size = 4

[*.{rst,ini}]
indent_style = space
indent_size = 4

[*.{yml,yaml,html,xml,xsl,json}]
indent_style = space
indent_size = 2

[Makefile]
indent_style = tab
indent_size = 1
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: daily
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
97 changes: 97 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
name: CI

on:
push:
branches:
- master
pull_request:

jobs:

msgcheck:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-python@v4
with:
python-version: "3.10"
- uses: actions/checkout@v4
- run: sudo apt install -y gettext aspell libenchant-2-dev
- uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('lint-requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- run: python -m pip install -r lint-requirements.txt
- run: msgcheck -n stdimage/locale/*/LC_MESSAGES/*.po

lint:
strategy:
fail-fast: false
matrix:
lint-command:
- "bandit -r . -x ./tests"
- "black --check --diff ."
- "flake8 ."
- "isort --check-only --diff ."
- "pydocstyle ."
runs-on: ubuntu-latest
steps:
- uses: actions/setup-python@v4
with:
python-version: "3.10"
- uses: actions/checkout@v4
- uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('lint-requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- run: python -m pip install -r lint-requirements.txt
- run: ${{ matrix.lint-command }}

dist:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: "3.10"
- run: sudo apt install gettext -y
- run: python -m pip install --upgrade pip build wheel twine readme-renderer
- run: python -m build --sdist --wheel
- run: python -m twine check dist/*
- uses: actions/upload-artifact@v3
with:
path: dist/*

pytest:
runs-on: ubuntu-latest
needs:
- lint
- msgcheck
strategy:
matrix:
python-version:
- "3.8"
- "3.9"
- "3.10"
django-version:
- "3.2"
- "4.0"
extra:
- "test"
- "test,progressbar"
steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- run: sudo apt install gettext -y
- uses: actions/checkout@v4
- run: python -m pip install --upgrade pip codecov
- run: python -m pip install -e .[${{ matrix.extra }}]
if: ${{ matrix.extra }}
- run: python -m pip install django~=${{ matrix.django-version }}a
- run: python -m pytest
- run: codecov
22 changes: 22 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Release

on:
release:
types: [published]

jobs:

PyPi:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: "3.10"
- run: sudo apt-get install gettext -y
- run: python -m pip install --upgrade pip build wheel twine
- run: python -m build --sdist --wheel
- run: python -m twine upload dist/*
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -4,8 +4,12 @@ django_stdimage.egg-info
build/
dist/
.idea/
.tox/
coverage.xml


.cache/
.coverage
htmlcov/

.eggs/
29 changes: 0 additions & 29 deletions .travis.yml

This file was deleted.

2 changes: 2 additions & 0 deletions FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github: codingjoe
custom: https://www.paypal.me/codingjoe
6 changes: 6 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
include stdimage/locale/*/LC_MESSAGES/django.po
include stdimage/locale/*/LC_MESSAGES/django.mo
prune tests
prune .github
exclude .*
exclude lint-requirements.txt
Loading