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

Bump dependencies #80

Merged
merged 2 commits into from
Jan 19, 2025
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
9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
name: Build and Test
strategy:
matrix:
python-versions: ['3.8', '3.9', '3.10', '3.11']
python-versions: ['3.9', '3.10', '3.11', '3.12', '3.13']
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}

Expand All @@ -44,7 +44,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox tox-gh-actions
pip install tox tox-gh-actions poetry
- name: Test with tox
run: tox
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
run: ls -Rla ${{steps.download.outputs.download-path}}

- name: 🚀 Publish code coverage to Code Climate
uses: paambaati/codeclimate-action@v8.0.0
uses: paambaati/codeclimate-action@v9.0.0
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
with:
Expand All @@ -99,13 +99,12 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.13'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install poetry
poetry self add "poetry-dynamic-versioning[plugin]"
- name: Build wheels and source tarball
run: |
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
python-versions: ['3.11']
python-versions: ['3.13']

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand All @@ -37,7 +37,6 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install poetry
poetry self add "poetry-dynamic-versioning[plugin]"
- name: Push tag
run: |
Expand Down
25 changes: 10 additions & 15 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos:
- id: forbid-tabs
- id: remove-tabs
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-builtin-literals
Expand All @@ -18,22 +18,17 @@ repos:
- id: forbid-new-submodules
- id: trailing-whitespace
- id: mixed-line-ending
- repo: https://github.com/pycqa/isort
rev: 5.13.2
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.9.2
hooks:
- id: isort
files: \.py$
- repo: https://github.com/psf/black
rev: 24.8.0
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
rev: 7.1.1
hooks:
- id: flake8
additional_dependencies: [flake8-typing-imports]
# Run the linter.
- id: ruff
args: [--fix]
# Run the formatter.
- id: ruff-format
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.11.1
rev: v1.14.1
hooks:
- id: mypy
files: octodns_netbox
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ $ git clone [email protected]:your_name_here/octodns-netbox.git
4. Install dependencies and start your virtualenv:

```
$ poetry install
$ poetry install --with dev
```

5. Create a branch for local development:
Expand Down
2 changes: 1 addition & 1 deletion octodns_netbox/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import requests
from octodns.record import Record, Rr
from octodns.source.base import BaseSource
from octodns.zone import DuplicateRecordException, SubzoneRecordException, Zone
from octodns.zone import SubzoneRecordException, Zone
from pydantic import (
AnyHttpUrl,
BaseModel,
Expand Down
2 changes: 0 additions & 2 deletions poetry.toml

This file was deleted.

66 changes: 25 additions & 41 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,66 +2,50 @@
build-backend = "poetry_dynamic_versioning.backend"
requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]

[tool]

[tool.black]
exclude = '''
/(
\.eggs
| \.git
| \.hg
| \.mypy_cache
| \.tox
| \.venv
| _build
| buck-out
| build
| dist
)/
'''
include = '\.pyi?$'
line-length = 88

[tool.poetry]
authors = ["Masaki Tagawa <[email protected]>"]
[project]
authors = [
{name = "Tagawa, Masaki", email = "[email protected]"}
]
classifiers = [
'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11'
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13'
]
dependencies = [
"octodns (>=1.10.0,<2.0.0)",
"pydantic (>=2.10.5,<3.0.0)",
"pynetbox (>=7.4.1,<8.0.0)",
"requests (>=2.32.3,<3.0.0)",
"typing-extensions (>=4.12.2,<5.0.0) ; python_version < '3.9'"
]
description = "A NetBox source for octoDNS."
dynamic = ["version"]
homepage = "https://github.com/sukiyaki/octodns-netbox"
license = "MIT"
name = "octodns-netbox"
packages = [
{include = "octodns_netbox"},
{include = "tests", format = "sdist"}
]
readme = "README.md"
version = "0.0.0"
requires-python = ">=3.9,<4"

[tool.poetry.dependencies]
octodns = {version = "^1.0.0"}
poetry = "^1.7.1"
pydantic = "^2.0.0"
pynetbox = {version = "^7.0.0"}
python = ">=3.8,<4.0"
requests = {version = "^2.31.0"}
typing-extensions = {version = "^4.9.0", python = "<3.9"}
[tool.poetry]
version = "0.0.0"

[tool.poetry.dev-dependencies]
pre-commit = "^3.0.0"
[tool.poetry.group.dev.dependencies]
pre-commit = "^4.0.0"
pytest = "^8.0.0"
pytest-cov = "^5.0.0"
requests-mock = "^1.11.0"
pytest-cov = "^6.0.0"
requests-mock = "^1.12.0"
tox = "^4.0.0"

[tool.poetry.requires-plugins]
poetry-dynamic-versioning = {version = ">=1.0.0,<2.0.0", extras = ["plugin"]}

[tool.poetry-dynamic-versioning]
bump = true
enable = true
Expand Down
38 changes: 16 additions & 22 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,50 +1,44 @@
[tox]
isolated_build = true
envlist =
py38, py39, py310, py311
coverage, lint, packaging
py39, py310, py311, py312, py313
lint, packaging

[gh-actions]
python =
3.11: py311, coverage, lint, packaging
3.10: py310, coverage
3.9: py39, coverage
3.8: py38, coverage
3.13: py313, lint, packaging
3.12: py312
3.11: py311
3.10: py310
3.9: py39

[testenv]
setenv =
PYTHONIOENCODING=utf-8
PY_COLORS=1
passenv = CI
skip_install = true
allowlist_externals =
poetry
commands_pre =
poetry self update
poetry self add "poetry-dynamic-versioning[plugin]"
poetry run python -m pip install pip -U
poetry self update
poetry install --with dev -v
commands =
poetry install --no-root -v
poetry run pytest []

[testenv:coverage]
basepython = python3
commands =
poetry install --no-root -v
poetry run pytest --cov=octodns_netbox --cov-report=xml --cov-report term-missing []
poetry run pytest --cov=octodns_netbox --cov-report=xml --cov-report term-missing []

[testenv:packaging]
skip_install = True
deps =
poetry
twine
poetry
twine
commands =
poetry build
twine check dist/*
poetry build
twine check dist/*

[testenv:lint]
skip_install = True
passenv = TERM
deps = pre-commit
commands_pre =
commands =
pre-commit run [] --all-files --show-diff-on-failure --hook-stage=manual
pre-commit run [] --all-files --show-diff-on-failure --hook-stage=manual
Loading