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
Always run configure step if dotnet modules are present
  • Loading branch information
@filmor
filmor committed Dec 10, 2020
commit d75cdccf22d7f6d49318cd0c82f63cd32daabb5f
15 changes: 1 addition & 14 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,7 @@ def run(self):
other_modules = [lib for lib in orig_modules if not isinstance(lib, DotnetLib)]

if dotnet_modules:
if os.path.isfile(CONFIGURED_PROPS):
self.announce("Already configured", level=distutils.log.INFO)
else:
self.announce("Writing configured.props...", level=distutils.log.INFO)
_write_configure_props()
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 @@ -151,14 +147,6 @@ def run(self):
# If no modules need to be compiled, skip


class bdist_wheel_patched(bdist_wheel):
def finalize_options(self):
# Monkey patch bdist_wheel to think the package is pure even though we
# include DLLs
super().finalize_options()
self.root_is_pure = True


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

Expand Down Expand Up @@ -221,7 +209,6 @@ def finalize_options(self):
# data_files=[("{install_platlib}", ["{build_lib}/pythonnet"])],
cmdclass={
"build_ext": BuildDotnet,
"bdist_wheel": bdist_wheel_patched,
"configure": Configure,
},
py_modules=["clr"],
Expand Down