8000 .NET Foundation updates by filmor · Pull Request #1148 · pythonnet/pythonnet · GitHub
[go: up one dir, main page]

Skip to content

.NET Foundation updates #1148

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.

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
merged 4 commits into from
May 18, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Update copyright notice and use Python.NET everywhere
  • Loading branch information
filmor committed May 17, 2020
commit 9ba56bfd41d9542738a769fe42f10718b9cfc15f
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changelog

All notable changes to Python for .NET will be documented in this file.
This project adheres to [Semantic Versioning][].
All notable changes to Python.NET will be documented in this file. This
project adheres to [Semantic Versioning][].

This document follows the conventions laid out in [Keep a CHANGELOG][].

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2006-2019 the contributors of the "Python for .NET" project
Copyright (c) 2006-2020 the contributors of the Python.NET project

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
Expand Down
7 changes: 3 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pythonnet - Python for .NET
pythonnet - Python.NET
===========================

|Join the chat at https://gitter.im/pythonnet/pythonnet|
Expand All @@ -8,7 +8,7 @@ pythonnet - Python for .NET
|license shield| |pypi package version| |conda-forge version| |python supported shield|
|stackexchange shield|

Python for .NET is a package that gives Python programmers nearly
Python.NET is a package that gives Python programmers nearly
seamless integration with the .NET Common Language Runtime (CLR) and
provides a powerful application scripting tool for .NET developers. It
allows Python code to interact with the CLR, and may also be used to
Expand All @@ -17,8 +17,7 @@ embed Python into a .NET application.
Calling .NET code from Python
-----------------------------

Python for .NET allows CLR namespaces to be treated essentially as
Python packages.
Python.NET allows CLR namespaces to be treated essentially as Python packages.

.. code-block::

Expand Down
2 changes: 1 addition & 1 deletion demo/wordpad.py
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ def InitializeComponent(self):
self.label1.Size = System.Drawing.Size(296, 140)
self.label1.TabIndex = 2
self.label1.Text = "Python Wordpad - an example winforms " \
"application using Python for .NET"
"application using Python.NET"

self.AutoScaleBaseSize = System.Drawing.Size(5, 13)
self.ClientSize = System.Drawing.Size(300, 150)
Expand Down
4 changes: 2 additions & 2 deletions src/SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
// associated with an assembly.
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("pythonnet")]
[assembly: AssemblyProduct("Python for .NET")]
[assembly: AssemblyCopyright("Copyright (c) 2006-2019 the contributors of the 'Python for .NET' project")]
[assembly: AssemblyProduct("Python.NET")]
[assembly: AssemblyCopyright("Copyright (c) 2006-2020 the contributors of the Python.NET project")]
[assembly: AssemblyTrademark("")]

[assembly: AssemblyCulture("")]
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Python for .NET")]
[assembly: AssemblyTitle("Python.NET")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyDefaultAlias("Python.Runtime.dll")]

Expand Down
4 changes: 2 additions & 2 deletions src/runtime/Python.Runtime.15.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<VersionPrefix>2.4.1</VersionPrefix>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Title>Python for .NET</Title>
<Copyright>Copyright (c) 2006-2019 the contributors of the 'Python for .NET' project</Copyright>
<Title>Python.NET</Title>
<Copyright>Copyright (c) 2006-2020 the contributors of the Python.NET project</Copyright>
<Description>Python and CLR (.NET and Mono) cross-platform language interop</Description>
<Authors>pythonnet</Authors>
<PackageLicenseUrl>https://github.com/pythonnet/pythonnet/blob/master/LICENSE</PackageLicenseUrl>
Expand Down
0