Skip to content

Commit 6effda8

Browse files
authored
Merge pull request #522 from nautobot/release-v3.0.1
Release 3.0.1
2 parents 0dcc02d + cb3e8d7 commit 6effda8

File tree

150 files changed

+649
-798
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+649
-798
lines changed

.bandit.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.cookiecutter.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
"_drift_manager": {
2222
"template": "https://github.com/nautobot/cookiecutter-nautobot-app.git",
2323
"template_dir": "nautobot-app",
24-
"template_ref": "refs/tags/nautobot-app-v2.2.1",
24+
"template_ref": "refs/tags/nautobot-app-v2.3.0",
2525
"cookie_dir": "",
2626
"branch_prefix": "drift-manager",
2727
"pull_request_strategy": "create",
2828
"post_actions": [
2929
"black"
3030
],
3131
"draft": true,
32-
"baked_commit_ref": "88cb0d71afd4889658b76c64cfb86d5b347e7565"
32+
"baked_commit_ref": "edf831ea98364f9a475ef147f13c1fb2f17b825f"
3333
}
3434
}
3535
}

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ FAQ.md
1919
.git/
2020
.gitignore
2121
.github
22-
tasks.py
2322
LICENSE
2423
**/*.log
2524
**/.vscode/

.github/workflows/ci.yml

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
APP_NAME: "nautobot-app-ssot"
1717

1818
jobs:
19-
black:
19+
ruff-format:
2020
runs-on: "ubuntu-22.04"
2121
env:
2222
INVOKE_NAUTOBOT_SSOT_LOCAL: "True"
@@ -25,20 +25,9 @@ jobs:
2525
uses: "actions/checkout@v4"
2626
- name: "Setup environment"
2727
uses: "networktocode/gh-action-setup-poetry-environment@v6"
28-
- name: "Linting: black"
29-
run: "poetry run invoke black"
30-
bandit:
31-
runs-on: "ubuntu-22.04"
32-
env:
33-
INVOKE_NAUTOBOT_SSOT_LOCAL: "True"
34-
steps:
35-
- name: "Check out repository code"
36-
uses: "actions/checkout@v4"
37-
- name: "Setup environment"
38-
uses: "networktocode/gh-action-setup-poetry-environment@v6"
39-
- name: "Linting: bandit"
40-
run: "poetry run invoke bandit"
41-
ruff:
28+
- name: "Linting: ruff format"
29+
run: "poetry run invoke ruff --action format"
30+
ruff-lint:
4231
runs-on: "ubuntu-22.04"
4332
env:
4433
INVOKE_NAUTOBOT_SSOT_LOCAL: "True"
@@ -60,17 +49,6 @@ jobs:
6049
uses: "networktocode/gh-action-setup-poetry-environment@v6"
6150
- name: "Check Docs Build"
6251
run: "poetry run invoke build-and-check-docs"
63-
flake8:
64-
runs-on: "ubuntu-22.04"
65-
env:
66-
INVOKE_NAUTOBOT_SSOT_LOCAL: "True"
67-
steps:
68-
- name: "Check out repository code"
69-
uses: "actions/checkout@v4"
70-
- name: "Setup environment"
71-
uses: "networktocode/gh-action-setup-poetry-environment@v6"
72-
- name: "Linting: flake8"
73-
run: "poetry run invoke flake8"
7452
poetry:
7553
runs-on: "ubuntu-22.04"
7654
env:
@@ -95,12 +73,10 @@ jobs:
9573
run: "poetry run invoke yamllint"
9674
check-in-docker:
9775
needs:
98-
- "bandit"
99-
- "ruff"
100-
- "flake8"
76+
- "ruff-format"
77+
- "ruff-lint"
10178
- "poetry"
10279
- "yamllint"
103-
- "black"
10480
runs-on: "ubuntu-22.04"
10581
strategy:
10682
fail-fast: true

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<a href="https://pypi.org/project/nautobot-ssot/"><img src="https://img.shields.io/pypi/v/nautobot-ssot"></a>
99
<a href="https://pypi.org/project/nautobot-ssot/"><img src="https://img.shields.io/pypi/dm/nautobot-ssot"></a>
1010
<br>
11-
An <a href="https://www.networktocode.com/nautobot/apps/">App</a> for <a href="https://nautobot.com/">Nautobot</a>.
11+
An <a href="https://networktocode.com/nautobot-apps/">App</a> for <a href="https://nautobot.com/">Nautobot</a>.
1212
</p>
1313

1414

changes/562.housekeeping

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Cut release 3.0.1.

development/nautobot_config.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Debug
1111
#
1212

13-
DEBUG = is_truthy(os.getenv("NAUTOBOT_DEBUG", False))
13+
DEBUG = is_truthy(os.getenv("NAUTOBOT_DEBUG", "false"))
1414
_TESTING = len(sys.argv) > 1 and sys.argv[1] == "test"
1515

1616
if DEBUG and not _TESTING:
@@ -48,9 +48,10 @@
4848
"PASSWORD": os.getenv("NAUTOBOT_DB_PASSWORD", ""), # Database password
4949
"HOST": os.getenv("NAUTOBOT_DB_HOST", "localhost"), # Database server
5050
"PORT": os.getenv(
51-
"NAUTOBOT_DB_PORT", default_db_settings[nautobot_db_engine]["NAUTOBOT_DB_PORT"]
51+
"NAUTOBOT_DB_PORT",
52+
default_db_settings[nautobot_db_engine]["NAUTOBOT_DB_PORT"],
5253
), # Database port, default to postgres
53-
"CONN_MAX_AGE": int(os.getenv("NAUTOBOT_DB_TIMEOUT", 300)), # Database timeout
54+
"CONN_MAX_AGE": int(os.getenv("NAUTOBOT_DB_TIMEOUT", "300")), # Database timeout
5455
"ENGINE": nautobot_db_engine,
5556
}
5657
}

development/run_example_job.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,8 @@
1818

1919
from django.core.management import call_command
2020
from nautobot.core.settings_funcs import is_truthy
21-
from nautobot.extras.choices import SecretsGroupAccessTypeChoices
22-
from nautobot.extras.choices import SecretsGroupSecretTypeChoices
23-
from nautobot.extras.models import ExternalIntegration
24-
from nautobot.extras.models import Job
25-
from nautobot.extras.models import Secret
26-
from nautobot.extras.models import SecretsGroup
27-
from nautobot.extras.models import SecretsGroupAssociation
21+
from nautobot.extras.choices import SecretsGroupAccessTypeChoices, SecretsGroupSecretTypeChoices
22+
from nautobot.extras.models import ExternalIntegration, Job, Secret, SecretsGroup, SecretsGroupAssociation
2823

2924
_TOKEN = 40 * "a"
3025
os.environ["NAUTOBOT_DEMO_TOKEN"] = _TOKEN

docs/admin/compatibility_matrix.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ While that last supported version will not be strictly enforced--via the max_ver
2626
| 2.7.0 | 2.1.0 | 2.99.09 |
2727
| 2.8.0 | 2.1.0 | 2.99.09 |
2828
| 3.0.0 | 2.1.0 | 2.99.09 |
29+
| 3.0.1 | 2.1.0 | 2.99.09 |

docs/admin/release_notes/version_3.0.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,21 @@ Updating DiffSync required changes to imports and many files changed `from diffs
2929
### Housekeeping
3030

3131
- [#433](https://github.com/nautobot/nautobot-app-ssot/issues/433) - Black 24.4.0 includes new formatting which was applied to all python files.
32+
33+
## [v3.0.1 (2024-08-23)](https://github.com/nautobot/nautobot-app-ssot/releases/tag/v3.0.1)
34+
35+
### Fixed
36+
37+
- [#507](https://github.com/nautobot/nautobot-app-ssot/issues/507) - Fixed DataTarget example Job to include run() function for using ExternalIntegration or supplied URL and token.
38+
39+
### Dependencies
40+
41+
- [#516](https://github.com/nautobot/nautobot-app-ssot/issues/516) - Fix the dependencies for mkdocstrings and mkdocstrings-python to fix RTD build.
42+
43+
### Documentation
44+
45+
- [#518](https://github.com/nautobot/nautobot-app-ssot/issues/518) - Minor doc updates on upgrade to 3.0.
46+
47+
### Housekeeping
48+
49+
- [#515](https://github.com/nautobot/nautobot-app-ssot/issues/515) - Rebaked from the cookie `nautobot-app-v2.3.0`.

0 commit comments

Comments
 (0)