From d29dbce1f2fad73de8e14b5d1481d9076e15d433 Mon Sep 17 00:00:00 2001 From: Wolfgang Fahl Date: Fri, 6 Oct 2023 07:05:35 +0200 Subject: [PATCH] fixes #14 --- README.md | 2 +- dgs/__init__.py | 1 + dgs/requirements.txt | 4 ---- pyproject.toml | 56 ++++++++++++++++++++++++++++++++++++++++++++ scripts/install | 2 +- scripts/test | 11 ++++++--- 6 files changed, 67 insertions(+), 9 deletions(-) delete mode 100644 dgs/requirements.txt create mode 100644 pyproject.toml diff --git a/README.md b/README.md index 9d8b42a..11b4337 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # diagrams -Diagrams-Service +Online diagrams-Service supporting graphviz and plantuml markup [![Join the chat at https://gitter.im/diagrams-service/community](https://badges.gitter.im/diagrams-service/community.svg)](https://gitter.im/diagrams-service/community) [![Travis (.org)](https://img.shields.io/travis/BITPlan/diagrams.svg)](https://travis-ci.org/BITPlan/diagrams) diff --git a/dgs/__init__.py b/dgs/__init__.py index e69de29..de9c5f9 100644 --- a/dgs/__init__.py +++ b/dgs/__init__.py @@ -0,0 +1 @@ +__version__="0.0.2" \ No newline at end of file diff --git a/dgs/requirements.txt b/dgs/requirements.txt deleted file mode 100644 index be98016..0000000 --- a/dgs/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -# 2020-02-13 -Flask -#https://pypi.org/project/pydevd/ -pydevd diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..5eddb66 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,56 @@ +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + +[project] +name = "diagrams" +authors = [ + {name = "Wolfgang Fahl", email = "wf@bitplan.com"} +] +maintainers = [ + {name = "Wolfgang Fahl", email = "wf@bitplan.com"}, +] +readme = "README.md" +license= "Apache-2.0" +dependencies = [ + "flask", + # nicegui widgets + # "ngwidgets>=0.0.24", +] + +requires-python = ">=3.8" +classifiers=[ + "Development Status :: 4 - Beta", + "Environment :: Console", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Operating System :: OS Independent", + "Topic :: Software Development :: Libraries :: Python Modules", + "Intended Audience :: Developers", + "Intended Audience :: Education", + "License :: OSI Approved :: Apache Software License" +] +dynamic = ["version", "description"] + +[tool.hatch.version] +path = "dgs/__init__.py" + +[project.urls] +Home = "https://github.com/BITPlan/diagrams" +Documentation = "http://wiki.bitplan.com/index.php/Diagrams" +Source = "https://github.com/BITPlan/diagrams" + +[project.optional-dependencies] +test = [ + "green", +] + +[tool.hatch.build.targets.wheel] +only-include = ["dgs"] + +[tool.hatch.build.targets.wheel.sources] +"dgs" = "dgs" + + diff --git a/scripts/install b/scripts/install index c30d3c9..be5734a 100755 --- a/scripts/install +++ b/scripts/install @@ -24,4 +24,4 @@ then echo "downloading plantuml" curl -L http://sourceforge.net/projects/plantuml/files/plantuml.jar/download -o plantuml.jar fi -pip3 install -r dgs/requirements.txt +pip install . diff --git a/scripts/test b/scripts/test index 6b4bc0c..b7400a1 100755 --- a/scripts/test +++ b/scripts/test @@ -1,4 +1,9 @@ #!/bin/bash -# WF 2020-02-13 -export PYTHONPATH="." -python3 -m unittest discover +# WF 2020-06-03 +#python3 -m unittest discover +pip list | egrep "^green " +if [ $? -ne 0 ] +then + pip install green +fi +green tests -s 1 \ No newline at end of file