Skip to content

Commit

Permalink
Merge remote-tracking branch 'Parent-Repo/develop' into nautobot#32-a…
Browse files Browse the repository at this point in the history
…dd-run-job-and-wait-method
  • Loading branch information
Renrut5 committed Jan 16, 2025
2 parents b19d773 + b931ac9 commit df5c3f9
Show file tree
Hide file tree
Showing 25 changed files with 885 additions and 580 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ on: # yamllint disable

jobs:
tests:
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-24.04"
strategy:
fail-fast: true
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
nautobot-version: ["2.0", "2.1", "2.2", "stable"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
nautobot-version: ["2.0", "2.1", "2.2", "2.3", "stable"]
env:
PYTHON_VER: "${{ matrix.python-version }}"
NAUTOBOT_VER: "${{ matrix.nautobot-version }}"
Expand All @@ -20,24 +20,27 @@ jobs:
uses: "actions/checkout@v4"
- name: "Setup environment"
uses: "networktocode/gh-action-setup-poetry-environment@v6"
with:
poetry-version: "1.8.5"
python-version: "3.12"
- name: "Set up Docker Buildx"
id: "buildx"
uses: "docker/setup-buildx-action@v3"
- name: "Tests"
run: "poetry run invoke tests"
publish_pypi:
name: "Push Package to PyPI"
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-24.04"
if: "startsWith(github.ref, 'refs/tags/v')"
steps:
- name: "Check out repository code"
uses: "actions/checkout@v4"
- name: "Set up Python"
uses: "actions/setup-python@v5"
with:
python-version: "3.9"
python-version: "3.12"
- name: "Install Python Packages"
run: "pip install poetry"
run: "pip install poetry==1.8.5"
- name: "Set env"
run: "echo RELEASE_VERSION=${GITHUB_REF:10} >> $GITHUB_ENV"
- name: "Run Poetry Version"
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ build:

mkdocs:
configuration: "mkdocs.yml"
fail_on_warning: false
fail_on_warning: true

# Use our docs/requirements.txt during installation.
python:
Expand Down
5 changes: 3 additions & 2 deletions development/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ RUN apt-get -y update && apt-get -y install --no-install-recommends \
git \
&& rm -rf /var/lib/apt/lists/*

RUN curl -sSL https://install.python-poetry.org | python3 - && \
# Install specific version of Poetry (1.8.5)
RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.8.5 python3 - && \
/root/.local/bin/poetry config virtualenvs.create false

WORKDIR /source
COPY pyproject.toml poetry.lock /source/
COPY pyproject.toml poetry.lock README.md /source/

RUN git config --global --add safe.directory /source

Expand Down
1 change: 1 addition & 0 deletions development/Dockerfile.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

!/pyproject.toml
!/poetry.lock
!/README.md
2 changes: 1 addition & 1 deletion development/dev.env
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ NAUTOBOT_DB_PASSWORD=decinablesprewad
NAUTOBOT_DB_USER=nautobot
NAUTOBOT_DB_TIMEOUT=300
NAUTOBOT_DB_ENGINE=django.db.backends.postgresql
NAUTOBOT_MAX_PAGE_SIZE=0
NAUTOBOT_MAX_PAGE_SIZE=100
NAUTOBOT_NAPALM_TIMEOUT=5
NAUTOBOT_REDIS_HOST=redis
NAUTOBOT_REDIS_PASSWORD=decinablesprewad
Expand Down
22 changes: 22 additions & 0 deletions docs/admin/release_notes/version_2.3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# v2.3.0

## Added

(#213) Added the ability to retrieve App endpoints via `dir`
(#214) Added support for seeing and modifying notes on all models
(#217) Added the ability to provide custom limit and offset parameters
(#233) Added the ability to run saved GraphQL queries

## Documentation Updates

(#218) Fixed documentation examples for working with prefixes

### Changed

(#224) Changed the `Termination.__str__ ` method to return the display field
(#240) Changed the `.all()` method to accept the same kwargs as `.filter()`, essentially making them redundant of each other
(#243) Updated urllib3 dependency to v2

### Housekeeping

(#220) Added Python 3.12 to test matrix
18 changes: 18 additions & 0 deletions docs/admin/release_notes/version_2.4.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# v2.4.0

## Added

(#248) Added support for new cloud models found in Nautobot 2.3+

## v2.4.1

### Fixed

- (#253) Fixed missing json data returned on cloud endpoints

## v2.4.2

### Fixed

- (#257) Fixed issue with pagination looping under certain conditions
- (#259) Fixed the `filter` field that was missing from dynamic group objects
5 changes: 5 additions & 0 deletions docs/dev/code_reference/models/cloud.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Cloud

::: pynautobot.models.cloud
options:
show_submodules: true
7 changes: 4 additions & 3 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
mkdocs==1.6.0
# Material for MkDocs theme
mkdocs-material==9.5.19
mkdocs-material==9.5.32
# Render custom markdown for version added/changed/remove notes
mkdocs-version-annotations==1.0.0
# Automatic documentation from sources, for MkDocs
mkdocstrings==0.24.3
mkdocstrings-python==1.10.0
griffe==1.1.1
mkdocstrings-python==1.10.8
mkdocstrings==0.25.2
markdown-data-tables==1.0.0
3 changes: 3 additions & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ nav:
- Uninstall: "admin/uninstall.md"
- Release Notes:
- "admin/release_notes/index.md"
- v2.4: "admin/release_notes/version_2.4.md"
- v2.3: "admin/release_notes/version_2.3.md"
- v2.2: "admin/release_notes/version_2.2.md"
- v2.1: "admin/release_notes/version_2.1.md"
- v2.0: "admin/release_notes/version_2.0.md"
Expand All @@ -162,6 +164,7 @@ nav:
- Util: "dev/code_reference/core/util.md"
- Models:
- Circuits: "dev/code_reference/models/circuits.md"
- Cloud: "dev/code_reference/models/cloud.md"
- DCIM: "dev/code_reference/models/dcim.md"
- Extras: "dev/code_reference/models/extras.md"
- IPAM: "dev/code_reference/models/ipam.md"
Expand Down
Loading

0 comments on commit df5c3f9

Please sign in to comment.