Skip to content
This repository was archived by the owner on Jul 17, 2024. It is now read-only.

Commit 4cb274c

Browse files
committed
Use fs and convert to v2
1 parent 7d88859 commit 4cb274c

File tree

7 files changed

+45
-36
lines changed

7 files changed

+45
-36
lines changed

MANIFEST.in

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
include inmanta_plugins/ssh/setup.cfg
2+
include inmanta_plugins/ssh/py.typed
3+
recursive-include inmanta_plugins/ssh/model *.cf
4+
graft inmanta_plugins/ssh/files
5+
graft inmanta_plugins/ssh/templates
File renamed without changes.

model/_init.cf

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Copyright 2020 Inmanta
2+
Copyright 2024 Inmanta
33

44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
1515

1616
1717
"""
18+
import fs
1819

1920
entity Key:
2021
"""
@@ -48,8 +49,8 @@ SSHUser.host [1] -- std::Host
4849
index SSHUser(host, home_dir)
4950

5051
implementation sshUser for SSHUser:
51-
dir = std::Directory(host=self.host, path="{{ home_dir }}/.ssh", mode=700, owner=user, group=group)
52-
file = std::File(
52+
dir = fs::Directory(host=self.host, path="{{ home_dir }}/.ssh", mode=700, owner=user, group=group)
53+
file = fs::File(
5354
host=host,
5455
mode=600,
5556
owner=user,

module.yml

-6
This file was deleted.

pyproject.toml

+4
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1+
[build-system]
2+
requires = [ "setuptools", "wheel",]
3+
build-backend = "setuptools.build_meta"
4+
15
[tool.pytest.ini_options]
26
asyncio_mode = "auto"

requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
inmanta-module-postgresql

setup.cfg

+31-27
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,40 @@
11
[flake8]
2-
# H101 Include your name with TODOs as in # TODO(yourname). This makes it easier to find out who the author of the comment was.
3-
# H302 Do not import objects, only modules DEPRICATED
4-
# H404 Multi line docstrings should start without a leading new line.
5-
# H405 multi line docstring summary not separated with an empty line
6-
# H301 Do not import more than one module per line (*)
7-
# H306 Alphabetically order your imports by the full module path.
8-
# E203 whitespace before ':' " on list slice.
9-
# E266 too many leading ‘#’ for block comment
10-
# E252 missing whitespace around parameter equals
11-
# F722 syntax error in forward annotation
12-
# W503 line break before binary operator
13-
# Note: E203 whitespaces and the slice operator. black and flake disagree
14-
# Note: F722 because many inmanta types are seen as forward declarations
152
ignore = H405,H404,H302,H306,H301,H101,E252,E203,F722,W503
16-
17-
# These inmanta primitive types will throw F821 in annotations
18-
# see: http://flake8.pycqa.org/en/latest/user/options.html#cmdoption-flake8-builtins
19-
builtins=string,number,bool
3+
builtins = string,number,bool
204
max-line-length = 128
215
exclude = **/.env,venv
22-
copyright-check=True
23-
copyright-author=Inmanta
6+
copyright-check = True
7+
copyright-author = Inmanta
248

259
[isort]
26-
multi_line_output=3
27-
include_trailing_comma=True
28-
force_grid_wrap=0
29-
use_parentheses=True
30-
# Black splits up import statements that are too long
31-
# Setting isorts line_length to 88 (blacks default) so they do not collide
32-
line_length=88
10+
multi_line_output = 3
11+
include_trailing_comma = True
12+
force_grid_wrap = 0
13+
use_parentheses = True
14+
line_length = 88
3315

3416
[black]
35-
line-length=128
17+
line-length = 128
3618
target-version = 'py36', 'py37', 'py38'
19+
20+
[metadata]
21+
name = inmanta-module-ssh
22+
freeze_recursive = False
23+
freeze_operator = ~=
24+
version = 1.0.3
25+
license = Apache 2.0
26+
four_digit_version = False
27+
28+
[egg_info]
29+
tag_build = dev0
30+
31+
[options]
32+
install_requires = inmanta-module-fs
33+
inmanta-module-std
34+
zip_safe = False
35+
include_package_data = True
36+
packages = find_namespace:
37+
38+
[options.packages.find]
39+
include = inmanta_plugins*
40+

0 commit comments

Comments
 (0)