Skip to content

Commit

Permalink
update deps, run pre-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
grizz committed Jan 10, 2024
1 parent 85441b5 commit e873720
Show file tree
Hide file tree
Showing 14 changed files with 111 additions and 97 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
linting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install virtualenv from poetry
uses: 20c/workflows/poetry@v1
- name: Run linters
Expand All @@ -22,11 +22,11 @@ jobs:
fail-fast: false
matrix:
os: [ "ubuntu-latest", "macos-latest" ]
python-version: [ "3.8", "3.9", "3.10", "3.11" ]
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
runs-on: ${{ matrix.os }}
steps:
- name: Check out repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install virtualenv from poetry
uses: 20c/workflows/poetry@v1
with:
Expand Down
13 changes: 11 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,19 @@ exclude: |
)$
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
rev: v4.5.0
hooks:
- id: check-yaml
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.1.11
hooks:
# Run the linter.
- id: ruff
args: [ --fix ]
# Run the formatter.
- id: ruff-format
- repo: local
hooks:
- id: system
Expand All @@ -20,7 +29,7 @@ repos:
hooks:
- id: pyupgrade
name: pyupgrade
entry: poetry run pyupgrade --py36-plus
entry: poetry run pyupgrade --py38-plus
language: python
types: [python]
pass_filenames: true
Expand Down
135 changes: 87 additions & 48 deletions poetry.lock

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ packages = [{ include = "django_peeringdb", from = "src" }]
[tool.poetry.dependencies]
python = "^3.8"
django_countries = ">1"
django_handleref = "^2"
django_inet = "^1"
asgiref = "^3"
django_handleref = ">=2"
django_inet = ">=1"
asgiref = ">=3"

[tool.poetry.dev-dependencies]
[tool.poetry.group.dev.dependencies]
# testing
codecov = ">=2"
coverage = ">=5"
Expand All @@ -41,29 +41,29 @@ pytest-cov = "*"
tox = ">=3.24"

# linting
# bandit = ">=1.6.2"
black = ">=20"
isort = ">=5.7"
flake8 = ">=3.8"
mypy = ">=0.950"
pre-commit = ">=2.13"
pyupgrade = ">=2.19"
ruff = "^0.1.11"

# docs
markdown = "*"
markdown-include = ">=0.5,<1"
mkdocs = "^1.2.3"
mkdocs = ">=1.2.3"

# ctl
ctl = ">=1"
jinja2 = ">=2"
tmpl = ">=1"
# v4 released 2022-03-31
twine = "^3.3.0"
twine = ">=3.3"

[tool.poetry.plugins."markdown.extensions"]
pymdgen = "pymdgen.md:Extension"


[build-system]
requires = ["poetry>=0.12"]
build-backend = "poetry.masonry.api"
Expand Down
7 changes: 1 addition & 6 deletions src/django_peeringdb/migrations/0007_add_verbose_names.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
# Generated by Django 2.2.12 on 2020-05-01 16:17

import django.db.models.deletion
import django_countries.fields
import django_inet.models
from django.db import migrations, models

import django_peeringdb.models.abstract
from django.db import migrations


class Migration(migrations.Migration):
Expand Down
5 changes: 0 additions & 5 deletions src/django_peeringdb/migrations/0010_ix_ixf_fields.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
# Generated by Django 2.2.12 on 2020-07-10 13:33

import django.db.models.deletion
import django_countries.fields
import django_inet.models
from django.db import migrations, models

import django_peeringdb.models.abstract


class Migration(migrations.Migration):
dependencies = [
Expand Down
5 changes: 0 additions & 5 deletions src/django_peeringdb/migrations/0011_ixlan_ixf_fields.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
# Generated by Django 2.2.12 on 2020-07-13 07:00

import django.db.models.deletion
import django_countries.fields
import django_inet.models
from django.db import migrations, models

import django_peeringdb.models.abstract


class Migration(migrations.Migration):
dependencies = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
# Generated by Django 3.1.2 on 2020-10-06 17:37

import django.db.models.deletion
import django_countries.fields
import django_inet.models
from django.db import migrations, models

import django_peeringdb.models.abstract


class Migration(migrations.Migration):
dependencies = [
Expand Down
4 changes: 0 additions & 4 deletions src/django_peeringdb/migrations/0017_facility_fields.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# Generated by Django 3.2.7 on 2021-09-07 13:34

import django.core.validators
import django.db.models.deletion
import django_countries.fields
import django_inet.models
from django.db import migrations, models

import django_peeringdb.fields
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Generated by Django 3.2.7 on 2021-09-21 15:50

import django.core.validators
import django_inet.models
from django.db import migrations, models


Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Generated by Django 3.2.7 on 2021-10-02 00:54

import django.core.validators
import django_inet.models
from django.db import migrations, models


Expand Down
4 changes: 1 addition & 3 deletions src/django_peeringdb/migrations/0020_status_dashboard.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Generated by Django 3.2.9 on 2022-02-02 13:59

import django.core.validators
import django_inet.models
from django.db import migrations, models
from django.db import migrations

import django_peeringdb.models.abstract

Expand Down
2 changes: 0 additions & 2 deletions src/django_peeringdb/migrations/0028_auto_20240109_1157.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Generated by Django 3.2.7 on 2024-01-09 11:57

import django.core.validators
import django_inet.models
from django.db import migrations

import django_peeringdb.fields
Expand Down
2 changes: 0 additions & 2 deletions src/django_peeringdb/migrations/0029_auto_20240109_1246.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Generated by Django 3.2.7 on 2024-01-09 12:46

import django.core.validators
import django_inet.models
from django.db import migrations

import django_peeringdb.fields
Expand Down

0 comments on commit e873720

Please sign in to comment.