Skip to content

Commit 6cd35f3

Browse files
author
denfromufa
authored
Merge branch 'master' into setsysargv
2 parents c35d2ad + d82ca28 commit 6cd35f3

File tree

161 files changed

+7357
-8854
lines changed

Some content is hidden

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

161 files changed

+7357
-8854
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
### Environment
2+
3+
- Pythonnet version:
4+
- Python version:
5+
- Operating System:
6+
7+
### Details
8+
9+
- Describe what you were trying to get done.
10+
11+
_TODO_
12+
13+
- What commands did you run to trigger this issue? If you can provide a
14+
[Minimal, Complete, and Verifiable example](http://stackoverflow.com/help/mcve)
15+
this will help us understand the issue.
16+
17+
```python
18+
print('TODO')
19+
```
20+
21+
- If there was a crash, please include the traceback here.
22+
23+
```python
24+
print('TODO')
25+
```

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
### What does this implement/fix? Explain your changes.
2+
3+
...
4+
5+
### Does this close any currently open issues?
6+
7+
...
8+
9+
### Any other comments?
10+
11+
...
12+
13+
### Checklist
14+
15+
Check all those that are applicable and complete.
16+
17+
- [ ] Make sure to include one or more tests for your change
18+
- [ ] If an enhancement PR, please create docs and at best an example
19+
- [ ] Add yourself to [`AUTHORS`](../blob/master/AUTHORS.md)
20+
- [ ] Updated the [`CHANGELOG`](../blob/master/CHANGELOG.md)

‎.travis.yml

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,49 @@
1-
sudo: required
2-
language: python
1+
sudo: false
32

3+
language: python
44
python:
55
- 2.7
66
- 3.3
77
- 3.4
88
- 3.5
99
- 3.6
10+
- 3.7-dev
11+
12+
matrix:
13+
allow_failures:
14+
- python: 3.7-dev
1015

11-
before_install:
12-
- sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"
13-
- sudo apt-get install software-properties-common
14-
- sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
15-
- echo "deb http://download.mono-project.com/repo/debian wheezy/snapshots/4.2.4.4 main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
16-
- echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list
17-
- sudo apt-get update
18-
- sudo DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install mono-devel mono-complete referenceassemblies-pcl ca-certificates-mono nunit-console
16+
env:
17+
global:
18+
- LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
19+
- SEGFAULT_SIGNALS=all
20+
- PYTHONUNBUFFERED=True
21+
22+
addons:
23+
apt:
24+
sources:
25+
- mono
26+
- mono-libtiff-compat
27+
packages:
28+
- mono-devel
29+
- ca-certificates-mono
30+
- nunit-console
1931

2032
install:
21-
- pip install six
22-
- pip install pycparser
23-
- python setup.py build_ext --inplace
33+
- pip install pycparser coverage codecov
34+
- coverage run setup.py build_ext --inplace
2435

2536
script:
2637
- export PYTHONPATH=`pwd`:$PYTHONPATH
2738
- python src/tests/runtests.py
28-
# - nunit-console src/embed_tests/bin/x64/ReleaseMono/Python.EmbeddingTest.dll
39+
# - nunit-console src/embed_tests/bin/Python.EmbeddingTest.dll
40+
41+
after_success:
42+
# Uncomment if need to geninterop, ie. py37 final
43+
# - python tools/geninterop/geninterop.py
44+
45+
# Waiting on mono-cov support or SharpCover
46+
- codecov
2947

3048
notifications:
3149
email: false

‎CHANGELOG.md

Lines changed: 86 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,104 @@ This 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-
- Python 3.6 support.
13-
- Added `__version__` to module.
12+
- Code Coverage (#345)
13+
- Added `pysetargv` (#347)
14+
- Added XML Documentation (#349)
15+
- Added PY3 settings to configuration-manager (#346)
16+
17+
### Changed
18+
19+
- Refactored `setup.py` (#337)
20+
- Upgraded NUnit framework to 2.6.4 (#353)
21+
- Completed refactor of Build Directives on `Runtime.cs` (#339)
22+
- Refactor python unittests (#329)
23+
- Unfroze Mono version on Travis (#345)
24+
- Enabled Embedded tests on Appveyor (#353)
25+
26+
### Fixed
27+
28+
- Fixed crash during Shutdown (#343)
29+
30+
### Removed
31+
32+
- Removed `six` dependency for unittests (#329)
33+
- Removed `Mono.Unix` dependency for `UCS4` (#360)
34+
35+
## [2.2.2][] - 2017-01-29
36+
37+
### Fixed
38+
39+
- Missing files from packaging (#336)
40+
41+
## [2.2.1][] - 2017-01-26
42+
43+
`v2.2.0` had a release issue on pypi. Bumped to `v2.2.1`
44+
45+
### Added
46+
47+
- Python 3.6 support (#310)
48+
- Added `__version__` to module (#312)
49+
- Added `conda` recipe (#281)
50+
- Nuget update on build (#268)
51+
- Added `__cause__` attribute on exception (#287)
52+
53+
### Changed
54+
55+
- License to MIT (#314)
56+
- Project clean-up (#320)
57+
- Refactor `#if` directives
58+
- Rename Decref/Incref to XDecref/XIncre (#275)
59+
- Remove printing if Decref is called with NULL (#275)
60+
61+
### Removed
62+
63+
- Python 2.6 support (#270)
64+
- Python 3.2 support (#270)
65+
66+
### Fixed
67+
68+
- Fixed `isinstance` refcount_leak (#273)
69+
- Comparison Operators (#294)
70+
- Improved Linux support (#300)
71+
- Exception pickling (#286)
1472

1573
## [2.2.0-dev1][] - 2016-09-19
1674

75+
### Changed
76+
1777
- Switch to C# 6.0 (#219)
18-
- Relative imports (#219)
19-
- Recursive types (#250)
20-
- Demo fix - stream reading (#225)
21-
- setup.py improvements for locating build tools (#208)
78+
- `setup.py` improvements for locating build tools (#208)
2279
- unmanaged exports updated (#206)
2380
- Mono update pinned to 4.2.4.4 (#233)
2481

82+
### Fixed
83+
84+
- Fixed relative imports (#219)
85+
- Fixed recursive types (#250)
86+
- Demo fix - stream reading (#225)
87+
2588
## [2.1.0][] - 2016-04-12
2689

2790
### Added
2891

29-
- Added Python 3.x support.
92+
- Added Python 3.2 support. (#78)
93+
- Added Python 3.3 support. (#78)
94+
- Added Python 3.4 support. (#78)
95+
- Added Python 3.5 support. (#163)
96+
- Managed types can be sub-classed in Python (#78)
97+
- Uses dynamic objects for cleaner code when embedding Python (#78)
98+
99+
### Changed
100+
101+
- Better Linux support (with or without --enable-shared option) (#78)
30102

31103
### Removed
32104

33-
- Implicit Type Casting.
105+
- Implicit Type Casting (#131)
34106

35107
## [2.0.0][] - 2015-06-26
36108

@@ -435,7 +507,11 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
435507

436508
[semantic versioning]: http://semver.org/
437509

438-
[unreleased]: ../../compare/v2.2.0-dev1...HEAD
510+
[unreleased]: ../../compare/v2.2.2...HEAD
511+
512+
[2.2.2]: ../../compare/v2.2.1...v2.2.2
513+
514+
[2.2.1]: ../../compare/v2.2.0-dev1...v2.2.1
439515

440516
[2.2.0-dev1]: ../../compare/v2.1.0...v2.2.0-dev1
441517

‎Python.Runtime.dll.config

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
<!-- Mono DLL map for Python.Runtime.dll
2-
3-
Keep this file next to Python.Runtime.dll
4-
5-
For more information read:
6-
http://www.mono-project.com/Config
7-
http://www.mono-project.com/Config_DllMap
8-
9-
-->
10-
1+
<?xml version="1.0" encoding="utf-8"?>
112
<configuration>
12-
<dllmap dll="python27" target="libpython2.7.so" os="!windows" />
13-
<dllmap dll="python33" target="libpython3.3.so" os="!windows" />
14-
<dllmap dll="python34" target="libpython3.4.so" os="!windows" />
3+
<!-- Mono DLL map for Python.Runtime.dll
4+
Keep this file next to Python.Runtime.dll
5+
For more information read:
6+
http://www.mono-project.com/Config
7+
http://www.mono-project.com/Config_DllMap -->
8+
<dllmap dll="python27" target="libpython2.7.so" os="!windows" />
9+
<dllmap dll="python33" target="libpython3.3.so" os="!windows" />
10+
<dllmap dll="python34" target="libpython3.4.so" os="!windows" />
1511
<dllmap dll="python35" target="libpython3.5.so" os="!windows" />
1612
<dllmap dll="python36" target="libpython3.6.so" os="!windows" />
17-
<dllmap dll="python27.dll" target="libpython2.7.so" os="!windows" />
18-
<dllmap dll="python33.dll" target="libpython3.3.so" os="!windows" />
19-
<dllmap dll="python34.dll" target="libpython3.4.so" os="!windows" />
13+
<dllmap dll="python37" target="libpython3.7.so" os="!windows" />
14+
<dllmap dll="python27.dll" target="libpython2.7.so" os="!windows" />
15+
<dllmap dll="python33.dll" target="libpython3.3.so" os="!windows" />
16+
<dllmap dll="python34.dll" target="libpython3.4.so" os="!windows" />
2017
<dllmap dll="python35.dll" target="libpython3.5.so" os="!windows" />
2118
<dllmap dll="python36.dll" target="libpython3.6.so" os="!windows" />
19+
<dllmap dll="python37.dll" target="libpython3.7.so" os="!windows" />
2220
</configuration>

‎README.md

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
# pythonnet - Python for .NET
22

3+
[![appveyor shield][]](https://ci.appveyor.com/project/pythonnet/pythonnet/branch/master)
4+
[![travis shield][]](https://travis-ci.org/pythonnet/pythonnet)
5+
[![codecov shield][]](https://codecov.io/github/pythonnet/pythonnet)
6+
[![license shield][]](./LICENSE)
7+
[![pypi package version][]](https://pypi.python.org/pypi/pythonnet)
8+
[![python supported shield][]](https://pypi.python.org/pypi/pythonnet)
9+
310
Python for .NET is a package that gives Python programmers nearly
411
seamless integration with the .NET Common Language Runtime (CLR) and
512
provides a powerful application scripting tool for .NET developers.
613
It allows Python code to interact with the CLR, and may also be used to
714
embed Python into a .NET application.
815

9-
[![travis shield][]](https://travis-ci.org/pythonnet/pythonnet)
10-
[![appveyor shield][]](https://ci.appveyor.com/project/pythonnet/pythonnet-0kq5d/branch/master)
11-
[![license shield][]](./LICENSE)
12-
1316
## Calling .NET code from Python
1417

1518
Python for .NET allows CLR namespaces to be treated essentially
@@ -68,16 +71,22 @@ static void Main(string[] args)
6871
Output:
6972

7073
```c
71-
1.0
72-
-0.958924274663
73-
-0.6752620892
74-
float64
75-
int32
76-
[6. 10. 12.]
74+
1.0
75+
-0.958924274663
76+
-0.6752620892
77+
float64
78+
int32
79+
[6. 10. 12.]
7780
```
7881

79-
[travis shield]: https://travis-ci.org/pythonnet/pythonnet.png?branch=master
82+
[appveyor shield]: https://img.shields.io/appveyor/ci/pythonnet/pythonnet/master.svg?label=AppVeyor
83+
84+
[codecov shield]: https://img.shields.io/codecov/c/github/pythonnet/pythonnet/master.svg?label=codecov
85+
86+
[license shield]: https://img.shields.io/badge/license-MIT-blue.svg?maxAge=3600
87+
88+
[pypi package version]: https://img.shields.io/pypi/v/pythonnet.svg
8089

81-
[appveyor shield]: https://ci.appveyor.com/api/projects/status/g4flfwq46g2adv6a/branch/master?svg=true
90+
[python supported shield]: https://img.shields.io/pypi/pyversions/pythonnet.svg
8291

83-
[license shield]: https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square
92+
[travis shield]: https://img.shields.io/travis/pythonnet/pythonnet/master.svg?label=Travis

0 commit comments

Comments
 (0)