Skip to content

Commit 5d495b4

Browse files
committed
merged 2.5.0 ( skipped pythonnet#930 , as it might have been superceded in Lost Tech branch )
2 parents c0c9479 + 801525a commit 5d495b4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+595
-475
lines changed

.bumpversion.cfg

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

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ dist: xenial
22
sudo: false
33
language: python
44
python:
5-
- 2.7
6-
- 3.5
7-
- 3.6
5+
- 3.8
86
- 3.7
7+
- 3.6
8+
- 3.5
9+
- 2.7
910

1011
env:
1112
matrix:

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))
@@ -45,6 +48,7 @@
4548
- Luke Stratman ([@lstratman](https://github.com/lstratman))
4649
- Konstantin Posudevskiy ([@konstantin-posudevskiy](https://github.com/konstantin-posudevskiy))
4750
- Matthias Dittrich ([@matthid](https://github.com/matthid))
51+
- Meinrad Recheis ([@henon](https://github.com/henon))
4852
- Mohamed Koubaa ([@koubaa](https://github.com/koubaa))
4953
- Patrick Stewart ([@patstew](https://github.com/patstew))
5054
- Raphael Nestler ([@rnestler](https://github.com/rnestler))
@@ -53,7 +57,6 @@
5357
- Sean Freitag ([@cowboygneox](https://github.com/cowboygneox))
5458
- Serge Weinstock ([@sweinst](https://github.com/sweinst))
5559
- Simon Mourier ([@smourier](https://github.com/smourier))
56-
- Victor Milovanov ([@lostmsu](https://github.com/lostmsu))
5760
- Viktoria Kovescses ([@vkovec](https://github.com/vkovec))
5861
- Ville M. Vainio ([@vivainio](https://github.com/vivainio))
5962
- Virgil Dupras ([@hsoft](https://github.com/hsoft))

CHANGELOG.md

Lines changed: 48 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,71 @@
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 `object.GetRawPythonProxy() -> PyObject` extension method, that bypasses any conversions
17-
- Added PythonException.Format method to format exceptions the same as traceback.format_exception
18-
- Added Python 3 buffer api support and PyBuffer interface for fast byte and numpy array read/write ([#980][p980])
12+
### Changed
13+
14+
### Fixed
15+
16+
## [2.5.0][] - 2020-06-14
17+
18+
This version improves performance on benchmarks significantly compared to 2.3.
19+
20+
### Added
21+
22+
- Automatic NuGet package generation in appveyor and local builds
23+
- Function that sets `Py_NoSiteFlag` to 1.
24+
- Support for Jetson Nano.
25+
- Support for `__len__` for .NET classes that implement ICollection
26+
- `PyExport` attribute to hide .NET types from Python
27+
- `PythonException.Format` method to format exceptions the same as
28+
`traceback.format_exception`
29+
- `Runtime.None` to be able to pass `None` as parameter into Python from .NET
30+
- `PyObject.IsNone()` to check if a Python object is None in .NET.
31+
- Support for Python 3.8
32+
- Codecs as the designated way to handle automatic conversions between
33+
.NET and Python types
1934

2035
### Changed
2136

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

3257
### Fixed
3358

34-
- Fixed runtime that fails loading when using pythonnet in an environment
35-
together with Nuitka
36-
- Fixes bug where delegates get casts (dotnetcore)
37-
- Determine size of interpreter longs at runtime
38-
- Handling exceptions ocurred in ModuleObject's getattribute
59+
- Fixed runtime that fails loading when using pythonnet in an environment
60+
together with Nuitka
61+
- Fixes bug where delegates get casts (dotnetcore)
62+
- Determine size of interpreter longs at runtime
63+
- Handling exceptions ocurred in ModuleObject's getattribute
64+
- Fill `__classcell__` correctly for Python subclasses of .NET types
65+
- Fixed issue with params methods that are not passed an array.
66+
- Use UTF8 to encode strings passed to `PyRun_String` on Python 3
3967

40-
## [2.4.0][]
68+
## [2.4.0][] - 2019-05-15
4169

4270
### Added
4371

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)

README.rst

Lines changed: 14 additions & 14 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|
@@ -20,8 +20,7 @@ embed Python into a .NET application.
2020
Calling .NET code from Python
2121
-----------------------------
2222

23-
Python for .NET allows CLR namespaces to be treated essentially as
24-
Python packages.
23+
Python.NET allows CLR namespaces to be treated essentially as Python packages.
2524

2625
.. code-block::
2726
@@ -93,18 +92,24 @@ Output:
9392
int32
9493
[ 6. 10. 12.]
9594
95+
96+
97+
Resources
98+
---------
99+
96100
Information on installation, FAQ, troubleshooting, debugging, and
97101
projects using pythonnet can be found in the Wiki:
98102

99103
https://github.com/pythonnet/pythonnet/wiki
100104

101-
Python 3.8.0 support
102-
--------------------
105+
Mailing list
106+
https://mail.python.org/mailman/listinfo/pythondotnet
107+
Chat
108+
https://gitter.im/pythonnet/pythonnet
103109

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

109114
.. |Join the chat at https://gitter.im/pythonnet/pythonnet| image:: https://badges.gitter.im/pythonnet/pythonnet.svg
110115
:target: https://gitter.im/pythonnet/pythonnet?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
@@ -127,8 +132,3 @@ Some features are disabled in Python 3.8.0 because of
127132
.. |github test shield| image:: https://github.com/losttech/pythonnet/workflows/Build%20%2B%20Test/badge.svg
128133
.. |nuget version| image:: https://img.shields.io/nuget/vpre/LostTech.Python.Runtime
129134
:target: https://www.nuget.org/packages/LostTech.Python.Runtime/
130-
131-
Resources
132-
---------
133-
Mailing list: https://mail.python.org/mailman/listinfo/pythondotnet
134-
Chat: https://gitter.im/pythonnet/pythonnet

appveyor.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,21 @@ environment:
1515
CODECOV_ENV: PYTHON_VERSION, PLATFORM
1616

1717
matrix:
18-
- PYTHON_VERSION: 2.7
18+
- PYTHON_VERSION: 3.8
1919
BUILD_OPTS: --xplat
20-
- PYTHON_VERSION: 3.5
20+
- PYTHON_VERSION: 3.7
2121
BUILD_OPTS: --xplat
2222
- PYTHON_VERSION: 3.6
2323
BUILD_OPTS: --xplat
24-
- PYTHON_VERSION: 3.7
25-
BUILD_OPTS: --xplat
26-
- PYTHON_VERSION: 2.7
2724
- PYTHON_VERSION: 3.5
28-
- PYTHON_VERSION: 3.6
25+
BUILD_OPTS: --xplat
26+
- PYTHON_VERSION: 2.7
27+
BUILD_OPTS: --xplat
28+
- PYTHON_VERSION: 3.8
2929
- PYTHON_VERSION: 3.7
30-
31-
matrix:
32-
allow_failures:
33-
- PYTHON_VERSION: 3.4
34-
BUILD_OPTS: --xplat
35-
- PYTHON_VERSION: 3.4
30+
- PYTHON_VERSION: 3.6
31+
- PYTHON_VERSION: 3.5
32+
- PYTHON_VERSION: 2.7
3633

3734
init:
3835
# Update Environment Variables based on matrix/platform
@@ -57,9 +54,8 @@ build_script:
5754
- coverage run setup.py bdist_wheel %BUILD_OPTS%
5855

5956
test_script:
60-
- pip install --no-index --find-links=.\dist\ pythonnet
57+
- pip install --find-links=.\dist\ pythonnet
6158
- ps: .\ci\appveyor_run_tests.ps1
62-
- ps: .\ci\appveyor_build_recipe.ps1
6359

6460
on_finish:
6561
# 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)