Skip to content

Commit f445b95

Browse files
lostmsulostmsu
committed
merge upstream master
2 parents 3590c29 + 742463e commit f445b95

26 files changed

+103
-214
lines changed

‎.bumpversion.cfg

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎AUTHORS.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
## Development Lead
44

5-
- Barton Cline ([@BartonCline](https://github.com/BartonCline))
65
- Benedikt Reinartz ([@filmor](https://github.com/filmor))
6+
- Victor Milovanov ([@lostmsu](https://github.com/lostmsu))
7+
8+
## Former Development Leads
9+
- Barton Cline ([@BartonCline](https://github.com/BartonCline))
710
- Brian Lloyd ([@brianlloyd](https://github.com/brianlloyd))
811
- David Anthoff ([@davidanthoff](https://github.com/davidanthoff))
912
- Denis Akhiyarov ([@denfromufa](https://github.com/denfromufa))
@@ -54,7 +57,6 @@
5457
- Sean Freitag ([@cowboygneox](https://github.com/cowboygneox))
5558
- Serge Weinstock ([@sweinst](https://github.com/sweinst))
5659
- Simon Mourier ([@smourier](https://github.com/smourier))
57-
- Victor Milovanov ([@lostmsu](https://github.com/lostmsu))
5860
- Viktoria Kovescses ([@vkovec](https://github.com/vkovec))
5961
- Ville M. Vainio ([@vivainio](https://github.com/vivainio))
6062
- Virgil Dupras ([@hsoft](https://github.com/hsoft))
@@ -71,4 +73,5 @@
7173
- ([@rmadsen-ks](https://github.com/rmadsen-ks))
7274
- ([@stonebig](https://github.com/stonebig))
7375
- ([@testrunner123](https://github.com/testrunner123))
76+
- ([@DanBarzilian](https://github.com/DanBarzilian))
7477

‎CHANGELOG.md

Lines changed: 49 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,75 @@
11
# Changelog
22

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

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

8-
## [unreleased][]
8+
## [Unreleased][]
99

1010
### Added
1111

12-
- Added automatic NuGet package generation in appveyor and local builds
13-
- Added function that sets Py_NoSiteFlag to 1.
14-
- Added support for Jetson Nano.
15-
- Added support for __len__ for .NET classes that implement ICollection
16-
- Added `PyExport` attribute to hide .NET types from Python
1712
- Added `__name__` and `__signature__` to reflected .NET methods
18-
- Added PythonException.Format method to format exceptions the same as traceback.format_exception
19-
- Added Runtime.None to be able to pass None as parameter into Python from .NET
20-
- Added PyObject.IsNone() to check if a Python object is None in .NET.
13+
14+
### Changed
15+
16+
### Fixed
17+
18+
- Fix incorrect dereference of wrapper object in tp_repr, which may result in a program crash
19+
20+
## [2.5.0][] - 2020-06-14
21+
22+
This version improves performance on benchmarks significantly compared to 2.3.
23+
24+
### Added
25+
26+
- Automatic NuGet package generation in appveyor and local builds
27+
- Function that sets `Py_NoSiteFlag` to 1.
28+
- Support for Jetson Nano.
29+
- Support for `__len__` for .NET classes that implement ICollection
30+
- `PyExport` attribute to hide .NET types from Python
31+
- `PythonException.Format` method to format exceptions the same as
32+
`traceback.format_exception`
33+
- `Runtime.None` to be able to pass `None` as parameter into Python from .NET
34+
- `PyObject.IsNone()` to check if a Python object is None in .NET.
2135
- Support for Python 3.8
36+
- Codecs as the designated way to handle automatic conversions between
37+
.NET and Python types
2238

2339
### Changed
2440

2541
- Added argument types information to "No method matches given arguments" message
2642
- Moved wheel import in setup.py inside of a try/except to prevent pip collection failures
27-
- Removes PyLong_GetMax and PyClass_New when targetting Python3
43+
- Removes `PyLong_GetMax` and `PyClass_New` when targetting Python3
2844
- Improved performance of calls from Python to C#
2945
- Added support for converting python iterators to C# arrays
30-
- Changed usage of obselete function GetDelegateForFunctionPointer(IntPtr, Type) to GetDelegateForFunctionPointer<TDelegate>(IntPtr)
31-
- When calling C# from Python, enable passing argument of any type to a parameter of C# type `object` by wrapping it into `PyObject` instance. ([#881][i881])
46+
- Changed usage of the obsolete function
47+
`GetDelegateForFunctionPointer(IntPtr, Type)` to
48+
`GetDelegateForFunctionPointer<TDelegate>(IntPtr)`
49+
- When calling C# from Python, enable passing argument of any type to a
50+
parameter of C# type `object` by wrapping it into `PyObject` instance.
51+
([#881][i881])
3252
- Added support for kwarg parameters when calling .NET methods from Python
3353
- Changed method for finding MSBuild using vswhere
34-
- Reworked `Finalizer`. Now objects drop into its queue upon finalization, which is periodically drained when new objects are created.
35-
- Marked `Runtime.OperatingSystemName` and `Runtime.MachineName` as `Obsolete`, should never have been `public` in the first place. They also don't necessarily return a result that matches the `platform` module's.
54+
- Reworked `Finalizer`. Now objects drop into its queue upon finalization,
55+
which is periodically drained when new objects are created.
56+
- Marked `Runtime.OperatingSystemName` and `Runtime.MachineName` as
57+
`Obsolete`, should never have been `public` in the first place. They also
58+
don't necessarily return a result that matches the `platform` module's.
59+
- Unconditionally depend on `pycparser` for the interop module generation
3660

3761
### Fixed
3862

39-
- Fixed runtime that fails loading when using pythonnet in an environment
40-
together with Nuitka
41-
- Fixes bug where delegates get casts (dotnetcore)
42-
- Determine size of interpreter longs at runtime
43-
- Handling exceptions ocurred in ModuleObject's getattribute
44-
- Fill `__classcell__` correctly for Python subclasses of .NET types
45-
- Fixed issue with params methods that are not passed an array.
63+
- Fixed runtime that fails loading when using pythonnet in an environment
64+
together with Nuitka
65+
- Fixes bug where delegates get casts (dotnetcore)
66+
- Determine size of interpreter longs at runtime
67+
- Handling exceptions ocurred in ModuleObject's getattribute
68+
- Fill `__classcell__` correctly for Python subclasses of .NET types
69+
- Fixed issue with params methods that are not passed an array.
70+
- Use UTF8 to encode strings passed to `PyRun_String` on Python 3
4671

47-
## [2.4.0][]
72+
## [2.4.0][] - 2019-05-15
4873

4974
### Added
5075

‎CONTRIBUTING.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
# How to contribute
22

3-
PythonNet is developed and maintained by unpaid community members so well
3+
Python.NET is developed and maintained by unpaid community members so well
44
written, documented and tested pull requests are encouraged.
55

66
By submitting a pull request for this project, you agree to license your
77
contribution under the MIT license to this project.
88

9+
This project has adopted the code of conduct defined by the Contributor
10+
Covenant to clarify expected behavior in our community. For more information
11+
see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
12+
913
## Getting Started
1014

1115
- Make sure you have a [GitHub account](https://github.com/signup/free)
@@ -41,3 +45,4 @@ contribution under the MIT license to this project.
4145

4246
- [General GitHub documentation](https://help.github.com/)
4347
- [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
48+
- [.NET Foundation Code of Conduct](https://dotnetfoundation.org/about/code-of-conduct)

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

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

55
Permission is hereby granted, free of charge, to any person obtaining a
66
copy of this software and associated documentation files (the "Software"),

‎README.rst

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pythonnet - Python for .NET
1+
pythonnet - Python.NET
22
===========================
33

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

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

20-
Python for .NET allows CLR namespaces to be treated essentially as
21-
Python packages.
20+
Python.NET allows CLR namespaces to be treated essentially as Python packages.
2221

2322
.. code-block::
2423
@@ -90,18 +89,24 @@ Output:
9089
int32
9190
[ 6. 10. 12.]
9291
92+
93+
94+
Resources
95+
---------
96+
9397
Information on installation, FAQ, troubleshooting, debugging, and
9498
projects using pythonnet can be found in the Wiki:
9599

96100
https://github.com/pythonnet/pythonnet/wiki
97101

98-
Python 3.8.0 support
99-
--------------------
102+
Mailing list
103+
https://mail.python.org/mailman/listinfo/pythondotnet
104+
Chat
105+
https://gitter.im/pythonnet/pythonnet
100106

101-
Some features are disabled in Python 3.8.0 because of
102-
`this bug in Python <https://bugs.python.org/issue37633>`_. The error is
103-
``System.EntryPointNotFoundException : Unable to find an entry point named
104-
'Py_CompileString' in DLL 'python38'``. This will be fixed in Python 3.8.1.
107+
.NET Foundation
108+
---------------
109+
This project is supported by the `.NET Foundation <https://dotnetfoundation.org>`_.
105110

106111
.. |Join the chat at https://gitter.im/pythonnet/pythonnet| image:: https://badges.gitter.im/pythonnet/pythonnet.svg
107112
:target: https://gitter.im/pythonnet/pythonnet?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
@@ -121,8 +126,3 @@ Some features are disabled in Python 3.8.0 because of
121126
:target: http://stackoverflow.com/questions/tagged/python.net
122127
.. |conda-forge version| image:: https://img.shields.io/conda/vn/conda-forge/pythonnet.svg
123128
:target: https://anaconda.org/conda-forge/pythonnet
124-
125-
Resources
126-
---------
127-
Mailing list: https://mail.python.org/mailman/listinfo/pythondotnet
128-
Chat: https://gitter.im/pythonnet/pythonnet

‎appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ build_script:
5454
- coverage run setup.py bdist_wheel %BUILD_OPTS%
5555

5656
test_script:
57-
- pip install --no-index --find-links=.\dist\ pythonnet
57+
- pip install --find-links=.\dist\ pythonnet
5858
- ps: .\ci\appveyor_run_tests.ps1
59-
- ps: .\ci\appveyor_build_recipe.ps1
6059

6160
on_finish:
6261
# Temporary disable multiple upload due to codecov limit of 20 per commit.

‎ci/appveyor_build_recipe.ps1

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎conda.recipe/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎conda.recipe/bld.bat

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎conda.recipe/meta.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎demo/wordpad.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ def InitializeComponent(self):
382382
self.label1.Size = System.Drawing.Size(296, 140)
383383
self.label1.TabIndex = 2
384384
self.label1.Text = "Python Wordpad - an example winforms " \
385-
"application using Python for .NET"
385+
"application using Python.NET"
386386

387387
self.AutoScaleBaseSize = System.Drawing.Size(5, 13)
388388
self.ClientSize = System.Drawing.Size(300, 150)

‎setup.cfg

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# [bumpversion] comments. bumpversion deleted all comments on its file.
2-
# Don't combine `.bumpversion.cfg` with `setup.cfg`. Messes up formatting.
3-
# Don't use `first_value = 1`. It will break `release` bump
4-
# Keep `optional = dummy` needed to bump to release.
5-
# See: https://github.com/peritus/bumpversion/issues/59
6-
71
[tool:pytest]
82
xfail_strict = True
93
# -r fsxX: show extra summary info for: (f)ailed, (s)kip, (x)failed, (X)passed

0 commit comments

Comments
 (0)