🌐 AI搜索 & 代理 主页
Skip to content

Commit cad95da

Browse files
amos402amos402
committed
Merge remote-tracking branch 'master' into soft-shutdown
2 parents 1cb8e8c + f0e9c38 commit cad95da

36 files changed

+1419
-104
lines changed

‎.editorconfig‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@ indent_size = 2
1919
[*.{csproj,pyproj,config}]
2020
indent_size = 2
2121

22+
# .NET formatting settings
23+
[*.{cs,vb}]
24+
dotnet_sort_system_directives_first = true
25+
dotnet_separate_import_directive_groups = true
26+
27+
[*.cs]
28+
csharp_new_line_before_open_brace = all
29+
csharp_new_line_before_else = true
30+
csharp_new_line_before_catch = true
31+
csharp_new_line_before_finally = true
32+
2233
# Solution
2334
[*.sln]
2435
indent_style = tab

‎AUTHORS.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
## Contributors
1414

15+
- Alex Earl ([@slide](https://github.com/slide))
16+
- Alex Helms ([@alexhelms](https://github.com/alexhelms))
1517
- Alexandre Catarino([@AlexCatarino](https://github.com/AlexCatarino))
1618
- Arvid JB ([@ArvidJB](https://github.com/ArvidJB))
1719
- Benoît Hudson ([@benoithudson](https://github.com/benoithudson))
@@ -33,6 +35,7 @@
3335
- Ivan Cronyn ([@cronan](https://github.com/cronan))
3436
- Jan Krivanek ([@jakrivan](https://github.com/jakrivan))
3537
- Jeff Reback ([@jreback](https://github.com/jreback))
38+
- Jeff Robbins ([@jeff17robbins](https://github.com/jeff17robbins))
3639
- Joe Frayne ([@jfrayne](https://github.com/jfrayne))
3740
- Joe Lidbetter ([@jmlidbetter](https://github.com/jmlidbetter))
3841
- Joe Savage ([@s4v4g3](https://github.com/s4v4g3))
@@ -41,6 +44,7 @@
4144
- Luke Stratman ([@lstratman](https://github.com/lstratman))
4245
- Konstantin Posudevskiy ([@konstantin-posudevskiy](https://github.com/konstantin-posudevskiy))
4346
- Matthias Dittrich ([@matthid](https://github.com/matthid))
47+
- Mohamed Koubaa ([@koubaa](https://github.com/koubaa))
4448
- Patrick Stewart ([@patstew](https://github.com/patstew))
4549
- Raphael Nestler ([@rnestler](https://github.com/rnestler))
4650
- Rickard Holmberg ([@rickardraysearch](https://github.com/rickardraysearch))

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
1010
### Added
1111

1212
- 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
1316

1417
### Changed
1518

@@ -25,6 +28,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
2528
- Fixed runtime that fails loading when using pythonnet in an environment
2629
together with Nuitka
2730
- Fixes bug where delegates get casts (dotnetcore)
31+
- Determine size of interpreter longs at runtime
2832

2933
## [2.4.0][]
3034

@@ -45,6 +49,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
4549
- Added PyObject finalizer support, Python objects referred by C# can be auto collect now ([#692][p692]).
4650
- Added detailed comments about aproaches and dangers to handle multi-app-domains ([#625][p625])
4751
- Python 3.7 support, builds and testing added. Defaults changed from Python 3.6 to 3.7 ([#698][p698])
52+
- Added support for C# types to provide `__repr__` ([#680][p680])
4853

4954
### Changed
5055

‎README.rst‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,14 @@ projects using pythonnet can be found in the Wiki:
9595

9696
https://github.com/pythonnet/pythonnet/wiki
9797

98+
Python 3.8.0 support
99+
--------------------
100+
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.
105+
98106
.. |Join the chat at https://gitter.im/pythonnet/pythonnet| image:: https://badges.gitter.im/pythonnet/pythonnet.svg
99107
:target: https://gitter.im/pythonnet/pythonnet?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
100108
.. |appveyor shield| image:: https://img.shields.io/appveyor/ci/pythonnet/pythonnet/master.svg?label=AppVeyor
@@ -113,3 +121,8 @@ https://github.com/pythonnet/pythonnet/wiki
113121
:target: http://stackoverflow.com/questions/tagged/python.net
114122
.. |conda-forge version| image:: https://img.shields.io/conda/vn/conda-forge/pythonnet.svg
115123
: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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@ environment:
2323
BUILD_OPTS: --xplat
2424
- PYTHON_VERSION: 3.7
2525
BUILD_OPTS: --xplat
26+
- PYTHON_VERSION: 3.8
27+
BUILD_OPTS: --xplat
2628
- PYTHON_VERSION: 2.7
2729
- PYTHON_VERSION: 3.5
2830
- PYTHON_VERSION: 3.6
2931
- PYTHON_VERSION: 3.7
32+
- PYTHON_VERSION: 3.8
3033

3134
- PYTHON_VERSION: 3.7
3235
PYTHONNET_SOFT_SHUTDOWN: 1
@@ -36,6 +39,9 @@ matrix:
3639
- PYTHON_VERSION: 3.4
3740
BUILD_OPTS: --xplat
3841
- PYTHON_VERSION: 3.4
42+
- PYTHON_VERSION: 3.8
43+
BUILD_OPTS: --xplat
44+
- PYTHON_VERSION: 3.8
3945

4046
init:
4147
# Update Environment Variables based on matrix/platform

0 commit comments

Comments
 (0)