From 224f1fa0c327f3fa08a865d6ae79d9cdb1ba19c4 Mon Sep 17 00:00:00 2001
From: Patrick Lehmann <Patrick.Lehmann@plc2.de>
Date: Mon, 28 Dec 2020 22:19:37 +0100
Subject: Tiny improvements.

---
 pyGHDL/__init__.py        |  0
 pyGHDL/libghdl/version.py |  2 +-
 pyGHDL/requirements.txt   |  2 ++
 requirements.txt          |  2 --
 setup.py                  | 22 ++++++++++++----------
 5 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 pyGHDL/__init__.py
 create mode 100644 pyGHDL/requirements.txt
 delete mode 100644 requirements.txt

diff --git a/pyGHDL/__init__.py b/pyGHDL/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/pyGHDL/libghdl/version.py b/pyGHDL/libghdl/version.py
index fcc6d13d8..6c7936ab3 100644
--- a/pyGHDL/libghdl/version.py
+++ b/pyGHDL/libghdl/version.py
@@ -1 +1 @@
-__version__ = "1.0-dev"
+__version__ = "1.0.0-dev"
diff --git a/pyGHDL/requirements.txt b/pyGHDL/requirements.txt
new file mode 100644
index 000000000..6f7932078
--- /dev/null
+++ b/pyGHDL/requirements.txt
@@ -0,0 +1,2 @@
+pydecor>=2.0.1
+pyVHDLModel>=0.7.1
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 6f7932078..000000000
--- a/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-pydecor>=2.0.1
-pyVHDLModel>=0.7.1
diff --git a/setup.py b/setup.py
index d2f47dc06..afb5bc241 100644
--- a/setup.py
+++ b/setup.py
@@ -36,22 +36,24 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # ============================================================================
 #
-import setuptools
-from re import compile as re_compile
+from pathlib    import Path
+from re         import compile as re_compile
+from setuptools import setup as setuptools_setup, find_packages as setuptools_find_packages
 
 gitHubNamespace = "ghdl"
 projectName = "ghdl"
 packageName = "pyGHDL"
+packagePath = Path(packageName)
 
-# read (local) README for upload to PyPI
-with open("README.md", "r") as file:
+# Read (local) README for upload to PyPI
+readmeFile = packagePath / "README.md"
+with readmeFile.open("r") as file:
 	long_description = file.read()
 
 # Read requirements file and add them to package dependency list
-requirements = []
-with open("requirements.txt") as file:
-	for line in file.readlines():
-		requirements.append(line)
+requirementsFile = packagePath / "requirements.txt"
+with requirementsFile.open("r") as file:
+	requirements = [line for line in file.readlines()]
 
 def get_version():
 	# Try from version.py.  Reads it to avoid loading the shared library.
@@ -71,7 +73,7 @@ sourceCodeURL =     "https://github.com/{namespace}/{projectName}".format(namesp
 documentationURL =  "https://{namespace}.github.io/{projectName}/using/py/index.html".format(namespace=gitHubNamespace, projectName=projectName)
 
 # Assemble all package information
-setuptools.setup(
+setuptools_setup(
 	name=packageName,
 	version=get_version(),
 
@@ -89,7 +91,7 @@ setuptools.setup(
 		'Issue Tracker': sourceCodeURL + "/issues"
 	},
 
-	packages=setuptools.find_packages(),
+	packages=setuptools_find_packages(),
 	entry_points={
 		'console_scripts': [
 			"ghdl-ls = pyGHDL.cli.lsp:main"
-- 
cgit v1.2.3