Skip to content
This repository was archived by the owner on Aug 19, 2022. It is now read-only.

Added closing tag to anchor for glyphicon. #304

Merged
merged 41 commits into from
Jun 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
ab5c83f
Added closing tag to anchor for glyphicon.
baeadmin1 Jun 18, 2021
cd01af7
Removal nox-poetry
Jun 20, 2021
2fcb2be
Fix nox versions
Jun 20, 2021
54d52c9
Merge pull request #308 from staticdev/removal-nox-poetry
Jun 20, 2021
9aa2438
Bump sphinx-rtd-theme from 0.5.1 to 0.5.2 in /docs
dependabot[bot] Jun 20, 2021
6fba2a1
Fix release-drafter
Jun 20, 2021
180c3fb
Merge pull request #313 from staticdev/fix-release-drafter
Jun 20, 2021
d1bd00c
Bump flake8-rst-docstrings from 0.0.14 to 0.2.3
dependabot[bot] Jun 20, 2021
e38c570
Add contributors
Jun 20, 2021
19f1b27
Merge pull request #310 from staticdev/dependabot/pip/flake8-rst-docs…
Jun 20, 2021
a54dafc
Fix contributos spaces
Jun 20, 2021
c925fb9
Merge pull request #315 from staticdev/add-maintainer
Jun 20, 2021
c568c58
Bump sphinx from 3.5.4 to 4.0.2
dependabot[bot] Jun 20, 2021
c5f22a4
Bump actions/cache from 2.1.3 to 2.1.6
dependabot[bot] Jun 20, 2021
f810941
Merge pull request #295 from staticdev/dependabot/github_actions/acti…
Jun 20, 2021
81447eb
Merge pull request #316 from staticdev/dependabot/pip/sphinx-4.0.2
Jun 20, 2021
33298bd
Bump codecov/codecov-action from 1.2.1 to 1.5.2
dependabot[bot] Jun 20, 2021
d1665a4
Bump pypa/gh-action-pypi-publish from 1.4.1 to 1.4.2
dependabot[bot] Jun 20, 2021
73f7dde
Merge pull request #290 from staticdev/dependabot/pip/docs/sphinx-rtd…
Jun 20, 2021
684f23a
Bump pre-commit-hooks from 3.4.0 to 4.0.1
dependabot[bot] Jun 20, 2021
456429c
Merge pull request #311 from staticdev/dependabot/pip/pre-commit-hook…
Jun 20, 2021
998ea46
Merge pull request #318 from staticdev/dependabot/github_actions/pypa…
Jun 20, 2021
f304085
Merge pull request #317 from staticdev/dependabot/github_actions/code…
Jun 20, 2021
42cc59f
Bump sphinx-autobuild from 2020.9.1 to 2021.3.14
dependabot[bot] Jun 20, 2021
39b6acb
Merge pull request #302 from staticdev/dependabot/pip/sphinx-autobuil…
Jun 20, 2021
fe633f8
Bump sphinx from 3.4.3 to 4.0.2 in /docs
dependabot[bot] Jun 20, 2021
0ffc1b5
Merge pull request #294 from staticdev/dependabot/pip/docs/sphinx-4.0.2
Jun 20, 2021
8edf434
Bump mypy from 0.790 to 0.902
dependabot[bot] Jun 20, 2021
043b186
Merge pull request #319 from staticdev/dependabot/pip/mypy-0.902
Jun 20, 2021
06f6f0a
Bump black from 20.8b1 to 21.6b0
dependabot[bot] Jun 20, 2021
6aa18ef
Merge pull request #309 from staticdev/dependabot/pip/black-21.6b0
Jun 20, 2021
a3f6c95
Bump flake8-bugbear from 20.11.1 to 21.4.3
dependabot[bot] Jun 20, 2021
72dc264
Merge pull request #300 from staticdev/dependabot/pip/flake8-bugbear-…
staticdev Jun 20, 2021
1d44f5c
Bump actions/upload-artifact from 2.2.2 to 2.2.4
dependabot[bot] Jun 20, 2021
eadd074
Merge pull request #293 from staticdev/dependabot/github_actions/acti…
staticdev Jun 20, 2021
0a63f7c
Bump actions/setup-python from 2.2.1 to 2.2.2
dependabot[bot] Jun 20, 2021
f010820
Merge pull request #291 from staticdev/dependabot/github_actions/acti…
staticdev Jun 20, 2021
34b323c
Bump actions/download-artifact from 2.0.8 to 2.0.10
dependabot[bot] Jun 20, 2021
6d6e251
Merge pull request #287 from staticdev/dependabot/github_actions/acti…
staticdev Jun 20, 2021
cec59a9
Added closing tag to anchor for glyphicon.
baeadmin1 Jun 18, 2021
8fa7052
Merge branch 'sort_th_fix' of github.com:rmassoth/django-sorting-boot…
baeadmin1 Jun 21, 2021
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
10 changes: 5 additions & 5 deletions .github/workflows/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pip==20.3.3
nox==2020.12.31
poetry==1.1.4
nox-poetry==0.7.1
virtualenv==20.4.0
pip==21.1.2
nox==2021.6.12
nox-poetry==0.8.6
poetry==1.1.6
virtualenv==20.4.7
1 change: 0 additions & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches:
- main
- master

jobs:
labeler:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release
on:
push:
branches:
- master
- main

jobs:
release:
Expand All @@ -16,7 +16,7 @@ jobs:
fetch-depth: 2

- name: Set up Python
uses: actions/setup-python@v2.2.1
uses: actions/setup-python@v2.2.2
with:
python-version: "3.8"

Expand Down Expand Up @@ -56,21 +56,21 @@ jobs:

- name: Publish package on PyPI
if: steps.check-version.outputs.tag
uses: pypa/gh-action-pypi-publish@v1.4.1
uses: pypa/gh-action-pypi-publish@v1.4.2
with:
user: __token__
password: ${{ secrets.PYPI_TOKEN }}

- name: Publish package on TestPyPI
if: "! steps.check-version.outputs.tag"
uses: pypa/gh-action-pypi-publish@v1.4.1
uses: pypa/gh-action-pypi-publish@v1.4.2
with:
user: __token__
password: ${{ secrets.TEST_PYPI_TOKEN }}
repository_url: https://test.pypi.org/legacy/

- name: Publish the release notes
uses: release-drafter/release-drafter@v5.13.0
uses: release-drafter/release-drafter@v5.15.0
with:
publish: ${{ steps.check-version.outputs.tag != '' }}
tag: ${{ steps.check-version.outputs.tag }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v2.3.4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2.1.4
uses: actions/setup-python@v2.2.2
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
print("::set-output name=result::{}".format(result))

- name: Restore pre-commit cache
uses: actions/cache@v2.1.3
uses: actions/cache@v2.1.6
if: matrix.session == 'pre-commit'
with:
path: ~/.cache/pre-commit
Expand All @@ -82,14 +82,14 @@ jobs:

- name: Upload coverage data
if: always() && matrix.session == 'tests'
uses: "actions/upload-artifact@v2.2.2"
uses: "actions/upload-artifact@v2.2.4"
with:
name: coverage-data
path: ".coverage.*"

- name: Upload documentation
if: matrix.session == 'docs-build'
uses: actions/upload-artifact@v2.2.2
uses: actions/upload-artifact@v2.2.4
with:
name: docs
path: docs/_build
Expand All @@ -102,7 +102,7 @@ jobs:
uses: actions/checkout@v2.3.4

- name: Set up Python 3.9
uses: actions/setup-python@v2.1.4
uses: actions/setup-python@v2.2.2
with:
python-version: 3.9

Expand All @@ -122,7 +122,7 @@ jobs:
nox --version

- name: Download coverage data
uses: actions/download-artifact@v2.0.8
uses: actions/download-artifact@v2.0.10
with:
name: coverage-data

Expand All @@ -135,4 +135,4 @@ jobs:
nox --force-color --session=coverage -- xml

- name: Upload coverage report
uses: codecov/codecov-action@v1.2.1
uses: codecov/codecov-action@v1.5.2
10 changes: 10 additions & 0 deletions CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Contributors
============


- Thiago D'Ávila (`@staticdev`_)
- Ryan Massoth (`@rmassoth`_)


.. _@staticdev: https://github.com/staticdev
.. _@rmassoth: https://github.com/rmassoth
2 changes: 1 addition & 1 deletion LICENSE.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MIT License
===========

Copyright © 2020 Thiago Carvalho D'Ávila
Copyright © 2021 Thiago D'Ávila

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 0 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
Django Sorting Bootstrap
========================

**MAINTAINER NEEDED: this project is complete but won't be updated until further notice. If you have interest in improving it, please contact me by creating an** `issue here`_ **.**

|PyPI| |Python Version| |License|

|Read the Docs| |Tests|
Expand Down
4 changes: 2 additions & 2 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sphinx==3.4.3
sphinx-rtd-theme==0.5.1
sphinx==4.0.2
sphinx-rtd-theme==0.5.2
35 changes: 22 additions & 13 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,21 @@
from textwrap import dedent

import nox
import nox_poetry.patch
from nox.sessions import Session

try:
from nox_poetry import Session
from nox_poetry import session
except ImportError:
message = f"""\
Nox failed to import the 'nox-poetry' package.
Please install it using the following command:
{sys.executable} -m pip install nox-poetry"""
raise SystemExit(dedent(message))


package = "django_sorting_bootstrap"
python_versions = ["3.9", "3.8", "3.7"]
nox.needs_version = ">= 2021.6.6"
nox.options.sessions = (
"pre-commit",
"safety",
Expand Down Expand Up @@ -72,7 +81,7 @@ def activate_virtualenv_in_precommit_hooks(session: Session) -> None:
hook.write_text("\n".join(lines))


@nox.session(name="pre-commit", python="3.9")
@session(name="pre-commit", python="3.9")
def precommit(session: Session) -> None:
"""Lint using pre-commit."""
args = session.posargs or ["run", "--all-files", "--show-diff-on-failure"]
Expand All @@ -94,15 +103,15 @@ def precommit(session: Session) -> None:
activate_virtualenv_in_precommit_hooks(session)


@nox.session(python="3.9")
@session(python="3.9")
def safety(session: Session) -> None:
"""Scan dependencies for insecure packages."""
requirements = nox_poetry.export_requirements(session)
requirements = session.poetry.export_requirements()
session.install("safety")
session.run("safety", "check", f"--file={requirements}", "--bare")
session.run("safety", "check", "--full-report", f"--file={requirements}")


@nox.session(python=python_versions)
@session(python=python_versions)
def mypy(session: Session) -> None:
"""Type-check using mypy."""
args = session.posargs or ["src", "tests", "docs/conf.py"]
Expand All @@ -113,7 +122,7 @@ def mypy(session: Session) -> None:
session.run("mypy", f"--python-executable={sys.executable}", "noxfile.py")


@nox.session(python=python_versions)
@session(python=python_versions)
def tests(session: Session) -> None:
"""Run the test suite."""
session.install(".")
Expand All @@ -125,7 +134,7 @@ def tests(session: Session) -> None:
session.notify("coverage")


@nox.session
@session
def coverage(session: Session) -> None:
"""Produce the coverage report."""
# Do not use session.posargs unless this is the only session.
Expand All @@ -140,15 +149,15 @@ def coverage(session: Session) -> None:
session.run("coverage", *args)


@nox.session(python=python_versions)
@session(python=python_versions)
def typeguard(session: Session) -> None:
"""Runtime type checking using Typeguard."""
session.install(".")
session.install("pytest", "pytest-django", "typeguard", "pygments")
session.run("pytest", f"--typeguard-packages={package}", *session.posargs)


@nox.session(python=python_versions)
@session(python=python_versions)
def xdoctest(session: Session) -> None:
"""Run examples with xdoctest."""
args = session.posargs or ["all"]
Expand All @@ -157,7 +166,7 @@ def xdoctest(session: Session) -> None:
session.run("python", "-m", "xdoctest", package, *args)


@nox.session(name="docs-build", python="3.9")
@session(name="docs-build", python="3.9")
def docs_build(session: Session) -> None:
"""Build the documentation."""
args = session.posargs or ["docs", "docs/_build"]
Expand All @@ -171,7 +180,7 @@ def docs_build(session: Session) -> None:
session.run("sphinx-build", *args)


@nox.session(python="3.9")
@session(python="3.9")
def docs(session: Session) -> None:
"""Build and serve the documentation with live reloading on file changes."""
args = session.posargs or ["--open-browser", "docs", "docs/_build"]
Expand Down
Loading