Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update and cleanup package #467

Merged
merged 4 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,12 @@ jobs:

tests_matrix:
runs-on: ubuntu-latest
needs: [ ruff ]
strategy:
matrix:
python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
django-version: [4.1, 4.2, 5.0, "main"]
django-version: [4.2, 5.0, "main"]
exclude:
# Django 4.1
- python-version: 3.12
django-version: 4.1

# Django 4.2
- python-version: 3.12
django-version: 4.2
Expand Down Expand Up @@ -64,22 +61,39 @@ jobs:

docs:
runs-on: ubuntu-latest
needs: [ tests_matrix ]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
cache: 'pip'
cache-dependency-path: docs/requirements.txt
- name: Install and build
- name: Build documentation
run: |
python -m pip install -r docs/requirements.txt
make docs

build:
runs-on: ubuntu-latest
needs: [ tests_matrix ]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
cache: 'pip'
cache-dependency-path: requirements-dev.txt
- name: Build package
run: |
python -m pip install -r requirements-dev.txt
make build


tests:
if: always()
runs-on: ubuntu-latest
needs: [ tests_matrix, ruff, docs ]
needs: [ tests_matrix, ruff, docs, build ]
steps:
- name: Check tests matrix status
if: needs.tests_matrix.result != 'success'
Expand Down
15 changes: 15 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
include LICENSE
include MANIFEST.in
include *.yaml
include pyproject.toml
include *.md
include *.py
include *.txt
include Makefile
include tox.ini
include docs/*.rst docs/*.txt docs/*.py docs/Makefile
graft src
graft tests
graft example
global-exclude *.pyc
prune docs/_build
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,15 @@ else
endif

.PHONY: build
build: docs
build:
python -m build
twine check dist/*
check-manifest
pyroma .
check-wheel-contents dist

.PHONY: publish
publish: porcelain branch build
twine check dist/*
publish: porcelain branch docs build
twine upload dist/*
git tag -a v${VERSION} -m "Release ${VERSION}"
git push origin --tags
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build-system]
build-backend = "setuptools.build_meta"
requires = ["setuptools>=64", "setuptools_scm>=8"]
requires = ["setuptools>=64"]

[project]
authors = [
Expand All @@ -10,7 +10,6 @@ classifiers = [
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Framework :: Django",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Intended Audience :: Developers",
Expand All @@ -26,9 +25,10 @@ classifiers = [
"Topic :: Utilities",
]
dependencies = [
"Django>=4.1",
"Django>=4.2",
]
description = "Icons for Django"
keywords = ["django", "icons"]
license = {file = "LICENSE"}
name = "django-icons"
readme = "README.md"
Expand Down
4 changes: 3 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
twine==5.0.0
build==1.2.1
setuptools==69.5.1
setuptools-scm==8.0.4
check-manifest==0.49
pyroma==4.2
check-wheel-contents==0.6.0
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[tox]
args_are_paths = false
envlist =
py38-{4.1,4.2},
py39-{4.1,4.2},
py310-{4.1,4.2,5.0,main},
py311-{4.1,4.2,5.0,main},
py38-{4.2},
py39-{4.2},
py310-{4.2,5.0,main},
py311-{4.2,5.0,main},
py312-{4.2,5.0,main},
docs,
lint,
Expand Down