Skip to content

Commit 7ff61a6

Browse files
authored
Merge pull request #230 from netbox-community/dev
Release 1.8.0
2 parents 1d3f305 + ea72ec0 commit 7ff61a6

File tree

7 files changed

+51
-83
lines changed

7 files changed

+51
-83
lines changed

.github/workflows/python-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Build package
3535
run: python -m build
3636
- name: Publish package
37-
uses: pypa/gh-action-pypi-publish@f7600683efdcb7656dec5b29656edb7bc586e597
37+
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
3838
with:
3939
user: __token__
4040
password: ${{ secrets.PYPI_API_TOKEN }}

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
ARG NETBOX_VARIANT=v4.1
1+
ARG NETBOX_VARIANT=v4.2
22

33
FROM netboxcommunity/netbox:${NETBOX_VARIANT}
44

55
RUN mkdir -pv /plugins/netbox-acls
66
COPY . /plugins/netbox-acls
77

8-
RUN /opt/netbox/venv/bin/python3 /plugins/netbox-acls/setup.py develop && \
9-
cp -rf /plugins/netbox-acls/netbox_acls/ /opt/netbox/venv/lib/python3.12/site-packages/netbox_acls
8+
RUN /usr/local/bin/uv pip install --editable /plugins/netbox-acls

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ This project just looks to build on top of this framework and model presented.
2525

2626
## Contributing
2727

28-
This project is currently maintained jointly by:
29-
30-
- [Abhimanyu Saharan](https://github.com/abhi1693)
31-
- [Ryan Merolle](https://github.com/ryanmerolle)
28+
This project is currently maintained by the [netbox-community](https://github.com/netbox-community).
3229

3330
See the [CONTRIBUTING](CONTRIBUTING.md) for more information.
3431

@@ -38,6 +35,7 @@ Each Plugin Version listed below has been tested with its corresponding NetBox V
3835

3936
| NetBox Version | Plugin Version |
4037
|:-------------------:|:--------------:|
38+
| 4.2.x | 1.8.0 |
4139
| 4.1.x | 1.7.0 |
4240
| >= 4.0.2 < 4.1.0 | 1.6.1 |
4341
| 3.7.x | 1.5.0 |

netbox_acls/__init__.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
"""
44

55
from netbox.plugins import PluginConfig
6-
7-
from .version import __version__
8-
6+
import importlib.metadata
97

108
class NetBoxACLsConfig(PluginConfig):
119
"""
@@ -14,11 +12,11 @@ class NetBoxACLsConfig(PluginConfig):
1412

1513
name = "netbox_acls"
1614
verbose_name = "Access Lists"
17-
version = __version__
15+
version = importlib.metadata.version('netbox-acls')
1816
description = "Manage simple ACLs in NetBox"
1917
base_url = "access-lists"
20-
min_version = "4.1.0"
21-
max_version = "4.1.99"
18+
min_version = "4.2.0"
19+
max_version = "4.2.99"
2220

2321

2422
config = NetBoxACLsConfig

netbox_acls/version.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

pyproject.toml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
[build-system]
2+
requires = ["setuptools"]
3+
build-backend = "setuptools.build_meta"
4+
5+
[tool.setuptools.package-data]
6+
netbox_acls = ["templates/**"]
7+
8+
[tool.setuptools]
9+
packages = ["netbox_acls"]
10+
11+
[tool.setuptools.package-dir]
12+
netbox_acls = "netbox_acls"
13+
114

215
[tool.black]
316
line-length = 140
@@ -21,3 +34,32 @@ reportMissingTypeStubs = false
2134

2235
[tool.ruff]
2336
line-length = 140
37+
38+
[project]
39+
name = "netbox-acls"
40+
version = "1.8.0"
41+
readme = "README.md"
42+
requires-python = ">=3.10.0"
43+
classifiers=[
44+
'Development Status :: 5 - Production/Stable',
45+
'Intended Audience :: Developers',
46+
'Apache Software License 2.0: License :: OSI Approved :: Apache Software License',
47+
'Natural Language :: English',
48+
"Programming Language :: Python :: 3 :: Only",
49+
'Programming Language :: Python :: 3.10',
50+
'Programming Language :: Python :: 3.11',
51+
'Programming Language :: Python :: 3.12',
52+
'Intended Audience :: System Administrators',
53+
'Intended Audience :: Telecommunications Industry',
54+
'Framework :: Django',
55+
'Topic :: System :: Networking',
56+
'Topic :: Internet',
57+
]
58+
keywords = ["netbox", "netbox-plugin"]
59+
60+
61+
62+
[project.urls]
63+
Documentation = "https://github.com/netbox-community/netbox-acls/blob/dev/README.md"
64+
Source = "https://github.com/netbox-community/netbox-acls/"
65+
Tracker = "https://github.com/netbox-community/netbox-acls/issues"

setup.py

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

0 commit comments

Comments
 (0)