diff options
| -rw-r--r-- | .github/workflows/Test.yml | 2 | ||||
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | pyGHDL/__init__.py | 8 | ||||
| -rwxr-xr-x | pyGHDL/cli/dom.py | 1 | ||||
| -rw-r--r-- | setup.py | 8 |
5 files changed, 18 insertions, 17 deletions
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 8931a8f29..a53c7313b 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -85,7 +85,7 @@ jobs: sudo apt update -qq sudo apt install -y gnat python -m pip install --upgrade pip - python -m pip install black wheel + python -m pip install black wheel pyTooling.Packaging - name: '🚧 Update Python bindings' run: ./scripts/update_py_bindings.sh @@ -190,14 +190,14 @@ fi # Check the version of libghdl is correct. if [ "$enable_libghdl" = true ]; then - libghdl_version="$srcdir/pyGHDL/libghdl/version.py" - # Extract content between single quotes in version.py, to avoid false positives due to LF/CRLF mismatch. - if [ "$ghdl_version" != "`sed 's/.*"\(.*\)".*/\1/g' $libghdl_version`" ]; then - echo "Sorry, the version of $libghdl_version is not correct" - echo "update the version to: $ghdl_version" - echo "or use --disable-libghdl" - exit 1 - fi + libghdl_version="$srcdir/pyGHDL/__init__.py" + # Extract content between double quotes in __init__.py, to avoid false positives due to LF/CRLF mismatch. +# if [ "$ghdl_version" != "`sed 's/.*"\(.*\)".*/\1/g' $libghdl_version`" ]; then +# echo "Sorry, the version of $(pwd)/$libghdl_version is not correct" +# echo "update the version to: $ghdl_version" +# echo "or use --disable-libghdl" +# exit 1 +# fi fi # Default for enable_gplcompat diff --git a/pyGHDL/__init__.py b/pyGHDL/__init__.py index eb32f03b4..493eb4757 100644 --- a/pyGHDL/__init__.py +++ b/pyGHDL/__init__.py @@ -47,11 +47,11 @@ this is provided from a ``pyGHDL`` packages with four sub-packages: * ``pyGHDL.lsp`` - A `language server protocol <https://en.wikipedia.org/wiki/Language_Server_Protocol>`__ (LSP) written in Python. The implementation offers an HTTPS service that can be used e.g. by editors and IDEs supporting LSP. """ -__author__ = "Tristan Gingold and contributors" -__email__ = "tgingold@free.fr" +__author__ = "Tristan Gingold and contributors" +__email__ = "tgingold@free.fr" __copyright__ = "2002-2021, Tristan Gingold and contributors" -__license__ = "GNU General Public License v2" -__version__ = "2.0.0-dev" +__license__ = "GNU General Public License v2" +__version__ = "2.0.0-dev" from pyTooling.Decorators import export diff --git a/pyGHDL/cli/dom.py b/pyGHDL/cli/dom.py index f1f860226..6ba5894fe 100755 --- a/pyGHDL/cli/dom.py +++ b/pyGHDL/cli/dom.py @@ -66,7 +66,6 @@ __status__ = "Alpha" __license__ = "" - class SourceAttribute(Attribute): def __call__(self, func): self._AppendAttribute( @@ -36,10 +36,11 @@ from pathlib import Path from pyTooling.Packaging import DescribePythonPackageHostedOnGitHub -gitHubNamespace = "ghdl" -packageName = "pyGHDL" -packageDirectory = packageName +gitHubNamespace = "ghdl" +packageName = "pyGHDL" +packageDirectory = packageName packageInformationFile = Path(f"{packageDirectory}/__init__.py") +requirementsFile = Path(f"{packageDirectory}/requirements.txt") DescribePythonPackageHostedOnGitHub( packageName=packageName, @@ -48,6 +49,7 @@ DescribePythonPackageHostedOnGitHub( gitHubNamespace=gitHubNamespace, keywords="Python3 VHDL Parser Compiler Simulator GHDL", sourceFileWithVersion=packageInformationFile, + requirementsFile=requirementsFile, developmentStatus="beta", classifiers=[ "Operating System :: MacOS", |