Skip to content

Commit

Permalink
Packaged main package also as *namespace package*.
Browse files Browse the repository at this point in the history
  • Loading branch information
Paebbels committed Oct 14, 2019
1 parent 5b7e57c commit 507f688
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pyIPCMI/Base/Project.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
from pathlib import Path

from flags import Flags
from xpyIPCMI.Parser.Files.FilesParser import VHDLSourceFileMixIn, VerilogSourceFileMixIn, CocotbSourceFileMixIn
from pyIPCMI.Parser.Files import VHDLSourceFileMixIn, VerilogSourceFileMixIn, CocotbSourceFileMixIn

from lib.Functions import merge
from pyIPCMI.Base.Exceptions import CommonException
Expand Down
2 changes: 1 addition & 1 deletion pyIPCMI/Compiler/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
from flags import Flags
from pyExceptions import ExceptionBase
from pyTokenizer import ParserException
from pyIPCMI.Parser.Rules import CopyRuleMixIn, DeleteRuleMixIn, ReplaceRuleMixIn, AppendLineRuleMixIn

from lib.Functions import Init
from pyIPCMI.Base import IHost
from pyIPCMI.Base.Exceptions import SkipableException
from pyIPCMI.Base.Project import Environment, VHDLVersion, FileTypes
from pyIPCMI.Base.Shared import Shared, to_time
from pyIPCMI.Parser.RulesParser import CopyRuleMixIn, DeleteRuleMixIn, ReplaceRuleMixIn, AppendLineRuleMixIn
from pyIPCMI.DataBase.Solution import RulesFile
from pyIPCMI.DataBase.TestCase import SynthesisSuite, CompileStatus, Synthesis

Expand Down
5 changes: 3 additions & 2 deletions pyIPCMI/DataBase/Solution.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@
from collections import OrderedDict
from textwrap import dedent

from pyIPCMI.Parser.Files import FilesParserMixIn
from pyIPCMI.Parser.Rules import RulesParserMixIn

from lib.Decorators import ILazyLoadable, LazyLoadTrigger
from pyIPCMI.Base.Exceptions import CommonException
from pyIPCMI.Base.Project import Project as BaseProject, File, FileTypes, VHDLSourceFile, VerilogSourceFile, CocotbSourceFile #, ProjectFile
from pyIPCMI.Parser.FilesParser import FilesParserMixIn
from pyIPCMI.Parser.RulesParser import RulesParserMixIn
from pyIPCMI.DataBase import __pyIPCMI_SOLUTION_KEYWORD__
from pyIPCMI.DataBase.Entity import Visibility
from pyIPCMI.ToolChain import ConfigurationException
Expand Down
11 changes: 8 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,15 @@
for line in file.readlines():
requirements.append(line)

projectName = "pyIPCMI"
namespace = ["pyIPCMI"] #, "Parser", "Files"]
projectName = ".".join(namespace)

github_url = "https://github.com/Paebbels/" + projectName
rtd_url = "https://" + projectName + ".readthedocs.io/en/latest/"

setuptools.setup(
name=projectName,
version="1.1.5",
version="1.1.6",

author="Patrick Lehmann",
author_email="Paebbels@gmail.com",
Expand All @@ -71,7 +72,11 @@
},
# download_url="",

packages=setuptools.find_packages(),
#packages=setuptools.find_packages(),
packages=setuptools.find_namespace_packages(
include=[".".join(namespace), ".".join(namespace) + ".*"]
),
namespace_packages=namespace[0:1],
classifiers=[
"License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
Expand Down

0 comments on commit 507f688

Please sign in to comment.