Skip to content

Convert projects to SDK style #1209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filmor merged 12 commits into from
Dec 10, 2020
Merged

Convert projects to SDK style #1209

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f811e51
Convert projects to SDK style
filmor Nov 7, 2020
5607205
Drop CLSCompliant attributes to get rid of warnings
filmor Nov 14, 2020
fabe401
Add pyparser dependency to pyproject.toml
filmor Dec 9, 2020
6f97bdd
Adjust clr loading and merge Mono code into one file
filmor Dec 9, 2020
ee990b7
Adjust workflows
filmor Dec 9, 2020
640b497
Ignore test failing on Mono for now
filmor Dec 9, 2020
d75cdcc
Always run configure step if dotnet modules are present
filmor Dec 10, 2020
6cb3fd9
Add solution items back
filmor Dec 10, 2020
deaf97b
Remove outdated comment
filmor Dec 10, 2020
916b26a
Run AppVeyor tests without coverage for now
filmor Dec 10, 2020
3ae7026
Split build_dotnet into its own command
filmor Dec 10, 2020
e3f8c20
Do the clr import later to not interfere with other test imports
filmor Dec 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Split build_dotnet into its own command
  • Loading branch information
@filmor
filmor committed Dec 10, 2020
commit 3ae7026c3e5cdf17e14f8c121e2bbbf9b215758f
63 changes: 37 additions & 26 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from wheel.bdist_wheel import bdist_wheel
from setuptools.command.build_ext import build_ext
import distutils
from distutils.command import build
from subprocess import check_output, check_call

import sys, os
Expand All @@ -26,6 +27,8 @@ def _get_interop_filename():
return os.path.join("src", "runtime", interop_filename)


# Write configuration to configured.props. This will go away once all of these
# can be decided at runtime.
def _write_configure_props():
defines = [
"PYTHON{0}{1}".format(PY_MAJOR, PY_MINOR),
Expand Down Expand Up @@ -60,7 +63,7 @@ def _write_configure_props():
ET.ElementTree(proj).write(CONFIGURED_PROPS)
Comment thread
filmor marked this conversation as resolved.


class Configure(Command):
class configure(Command):
"""Configure command"""

description = "Configure the pythonnet build"
Expand All @@ -77,36 +80,34 @@ def run(self):
_write_configure_props()


class DotnetLib(Extension):
class DotnetLib:
def __init__(self, name, path, **kwargs):
self.name = name
self.path = path
self.args = kwargs
super().__init__(name, sources=[])


class BuildDotnet(build_ext):
class build_dotnet(Command):
"""Build command for dotnet-cli based builds"""

description = "Build DLLs with dotnet-cli"
user_options = [("dotnet-config", None, "dotnet build configuration")]

def initialize_options(self):
self.dotnet_config = "release"
super().initialize_options()
self.dotnet_config = None
self.build_lib = None

def finalize_options(self):
super().finalize_options()

def get_source_files(self):
return super().get_source_files()
if self.dotnet_config is None:
self.dotnet_config = "release"

build = self.distribution.get_command_obj("build")
build.ensure_finalized()
self.build_lib = build.build_lib

def run(self):
orig_modules = self.distribution.ext_modules
dotnet_modules = [lib for lib in orig_modules if isinstance(lib, DotnetLib)]
other_modules = [lib for lib in orig_modules if not isinstance(lib, DotnetLib)]

if dotnet_modules:
self.run_command("configure")
dotnet_modules = self.distribution.dotnet_libs
self.run_command("configure")

for lib in dotnet_modules:
output = os.path.join(os.path.abspath(self.build_lib), lib.args.pop("output"))
Expand Down Expand Up @@ -140,18 +141,21 @@ def run(self):
else:
self.warn("Can't find file to rename: {}, current dir: {}".format(source, os.getcwd()))

if other_modules:
self.distribution.ext_modules = other_modules
super().run()
self.distribution.ext_modules = orig_modules
# If no modules need to be compiled, skip
# Add build_dotnet to the build tasks:
from distutils.command.build import build as _build
from setuptools import Distribution

class build(_build):
sub_commands = _build.sub_commands + [('build_dotnet', None)]

Distribution.dotnet_libs = None


with open("README.rst", "r") as f:
long_description = f.read()


ext_modules = [
dotnet_libs = [
DotnetLib(
"python-runtime",
"src/runtime/Python.Runtime.csproj",
Expand All @@ -173,6 +177,8 @@ def run(self):
),
]

ext_modules = []

try:
mono_libs = check_output("pkg-config --libs mono-2", shell=True, encoding="utf8")
mono_cflags = check_output(
Expand All @@ -194,7 +200,14 @@ def run(self):
print("Failed to find mono libraries via pkg-config, skipping the Mono CLR loader")



setup(
cmdclass={
"build": build,
"build_dotnet": build_dotnet,
"configure": configure,
},

name="pythonnet",
version="3.0.0.dev1",
description=".Net and Mono integration for Python",
Expand All @@ -207,12 +220,10 @@ def run(self):
install_requires=["pycparser"],
long_description=long_description,
# data_files=[("{install_platlib}", ["{build_lib}/pythonnet"])],
cmdclass={
"build_ext": BuildDotnet,
"configure": Configure,
},

py_modules=["clr"],
ext_modules=ext_modules,
dotnet_libs=dotnet_libs,
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down