Skip to content

Commit

Permalink
Update linting config files and project classifiers
Browse files Browse the repository at this point in the history
  • Loading branch information
hugorodgerbrown committed Jan 28, 2020
1 parent 5685078 commit 510222b
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 49 deletions.
4 changes: 0 additions & 4 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,3 @@ ignore =
S308 # [bandit] Use of mark_safe
S311 # [bandit] Use of random
S703 # [bandit] Use of django_mark_safe

[bandit]
exclude_dirs =
**/tests/*
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
*.pyc
*.egg-info
.coverage
.tox
poetry.lock
Pipfile.lock
.venv
*.egg-info
*.lock
*.pyc
29 changes: 10 additions & 19 deletions .pylintrc
Original file line number Diff line number Diff line change
@@ -1,26 +1,17 @@
# This pylintrc exists for the purpose of enforcing a certain style guide across our Python code.

[MASTER]
init-hook="from pylint.config import find_pylintrc; import os, sys; sys.path.append(os.path.dirname(find_pylintrc()));"
ignore=CVS,.git,.tox,.cache,.venv,frontend
ignore = .git,.tox,.cache,.venv

[MESSAGES CONTROL]
disable=all
enable=
anomalous-backslash-in-string
assert-false
assert-outside-tests
bare-except
broad-except
dangerous-default-value
direct-logging
import-pdb
import-silk
disable = all
enable =
broad-except,
dangerous-default-value,
relative-beyond-top-level,
anomalous-backslash-in-string,
logging-not-lazy
relative-beyond-top-level
unused-import

[REPORTS]
output-format=text
reports=no
score=no
output-format = text
reports = no
score = no
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT Licence (MIT)

Copyright (c) 2017 YunoJuno Ltd
Copyright (c) 2020 YunoJuno Ltd

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: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Django app for managing external side effects.
Python2/3
---------

**This project now supports Python37/38 and Django 2.2+ only on master.**
**This project now supports Python 3.7+ and Django 2.2+ only on master.**

Legacy versions are tagged.

Expand Down
11 changes: 0 additions & 11 deletions mypy.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
# This file is not yet enforced on CI but exists
# here so that we can test our type hinting every
# now and then. When Django and other tooling has
# caught up, the idea is that we block on type
# checking failures via CI.

[mypy]
; python_version=3.7
strict_optional=True
ignore_missing_imports=True
follow_imports=silent
Expand All @@ -15,10 +8,6 @@ warn_unreachable = true
disallow_untyped_defs = true
disallow_incomplete_defs = true

# Disable mypy for admin.py files
[mypy-*.admin]
ignore_errors=True

# Disable mypy for migrations
[mypy-*.migrations.*]
ignore_errors=True
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[tool.poetry]
name = "django-side-effects"
version = "1.6"
version = "1.6.1"
description = "Django app for managing external side effects."
license = "MIT"
authors = ["YunoJuno <code@yunojuno.com>"]
maintainers = ["YunoJuno <code@yunojuno.com>"]
readme = "README.rst"
homepage = "https://github.com/yunojuno/poetry-template"
repository = "https://github.com/yunojuno/poetry-template"
homepage = "https://github.com/yunojuno/django-side-effects"
repository = "https://github.com/yunojuno/django-side-effects"
classifiers = [
"Environment :: Web Environment",
"Framework :: Django :: 2.2",
Expand All @@ -20,7 +20,7 @@ classifiers = [
packages = [{ include = "side_effects" }]

[tool.poetry.dependencies]
python = "^3.6"
python = "^3.7"
django = "^2.2 || ^3.0"
python-env-utils = "*"

Expand Down
8 changes: 3 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[tox]
isolated_build = True
envlist = fmt, lint, mypy, py{36,37,38}-django{22,30}
envlist = fmt, lint, mypy, py{37,38}-django{22,30}

[travis]
python =
3.6: lint, mypy, py36
3.7: lint, mypy, py37
3.8: lint, mypy, py38

Expand All @@ -26,14 +25,13 @@ deps =
black

commands =
isort --recursive side_effects
black side_effects
isort --recursive --check-only side_effects
black --check side_effects

[testenv:lint]
description = 'Source file linting'
deps =
pylint
pylint-django
flake8
flake8-bandit
flake8-docstrings
Expand Down

0 comments on commit 510222b

Please sign in to comment.