Skip to content

Commit 49a3f2b

Browse files
committed
Merge branch 'develop' of https://github.com/netbox-community/netbox-docker into fix-editorconfig-checker
2 parents f402d54 + e5400e3 commit 49a3f2b

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

.editorconfig-checker.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
"IgnoreDefaults": false,
55
"SpacesAfterTabs": false,
66
"NoColor": false,
7-
"Exclude": [
8-
"LICENSE",
9-
"\\.initializers",
10-
"\\.vscode"
11-
],
7+
"Exclude": ["LICENSE", "\\.initializers", "\\.vscode"],
128
"AllowedContentTypes": [],
139
"PassedFiles": [],
1410
"Disable": {

.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
VALIDATE_GITLEAKS: false
4242
VALIDATE_JSCPD: false
4343
FILTER_REGEX_EXCLUDE: (.*/)?(LICENSE|configuration/.*)
44-
EDITORCONFIG_FILE_NAME: .ecrc
44+
EDITORCONFIG_FILE_NAME: .editorconfig-checker.json
4545
DOCKERFILE_HADOLINT_FILE_NAME: .hadolint.yaml
4646
MARKDOWN_CONFIG_FILE: .markdown-lint.yml
4747
PYTHON_BLACK_CONFIG_FILE: pyproject.toml

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG FROM
22
FROM ${FROM} AS builder
33

4-
COPY --from=ghcr.io/astral-sh/uv:0.5 /uv /usr/local/bin/
4+
COPY --from=ghcr.io/astral-sh/uv:0.6 /uv /usr/local/bin/
55
RUN export DEBIAN_FRONTEND=noninteractive \
66
&& apt-get update -qq \
77
&& apt-get upgrade \

requirements-container.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
django-auth-ldap==5.1.0
2-
django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.4
3-
dulwich==0.22.7
2+
django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.5
3+
dulwich==0.22.8
44
python3-saml==1.16.0
55
--no-binary lxml
66
--no-binary xmlsec
7-
sentry-sdk[django]==2.20.0
7+
sentry-sdk[django]==2.24.0

test-configuration/test_config.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@
33
'disable_existing_loggers': True
44
}
55

6+
PLUGINS = [
7+
'netbox.tests.dummy_plugin',
8+
]
9+
10+
611
DEFAULT_PERMISSIONS = {}

0 commit comments

Comments
 (0)