diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index bb50493..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "cSpell.language": "en,fr" -} \ No newline at end of file diff --git a/Makefile b/Makefile index a15a119..29acd2b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,15 @@ +# Optional default target +# all: init test + +# Install the package in editable mode init: - pip install -r requirements.txt + @echo "Installing dependencies..." + pip install -e . +# Run the test suite test: - py.test tests + @echo "Running tests..." + py.test tests +# Declare phony targets so make knows they are not files .PHONY: init test \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index ebb76df..76d2dd4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ #cf. doc at https://packaging.python.org/en/latest/guides/writing-pyproject-toml [build-system] -requires = ["setuptools"] +requires = ["setuptools>=70.0.0"] build-backend = "setuptools.build_meta" [tool.setuptools] @@ -11,17 +11,26 @@ name = "ligojcli" version = "1.0.0" description = "Ligoj CLI" authors = [{ name = "Fabrice Daugé", email = "fdaugan@kloudy.io" }] +readme = "README.md" +requires-python = ">=3.10" + dependencies = [ "colorama==0.4.6", "requests==2.32.4", - "dnspython==2.7.0", + "dnspython==2.8.0", "pyyaml==6.0.2", "configparser==7.2.0", "unidecode==1.4.0", - "jsonschema===4.25.0", + "jsonschema==4.25.0", "jsonmerge==1.9.2", "Jinja2==3.1.6" ] [project.scripts] -ligoj = "ligojcli.ligoj:ligoj" \ No newline at end of file +ligoj = "ligojcli.ligoj:ligoj" + +[tool.setuptools.package-data] +ligojcli = ["*.yaml", "*.json"] + +[tool.setuptools.exclude-package-data] +ligojcli = ["tests/*"] \ No newline at end of file diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index b7cc849..0000000 --- a/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -colorama==0.4.6 -requests==2.32.4 -dnspython==2.7.0 -pyyaml==6.0.2 -configparser==7.2.0 -unidecode==1.4.0 -jsonschema===4.25.0 -jsonmerge==1.9.2 -Jinja2==3.1.6 \ No newline at end of file