pythonnet · den-run-ai · Feb 9, 2017 · Feb 9, 2017 · Feb 13, 2017 · Feb 13, 2017
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -0,0 +1,29 @@
+[bumpversion]
+current_version = 2.4.0.dev0
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
+serialize = 
+	{major}.{minor}.{patch}.{release}{dev}
+	{major}.{minor}.{patch}
+
+[bumpversion:part:release]
+optional_value = dummy
+values = 
+	dev
+	dummy
+
+[bumpversion:part:dev]
+
+[bumpversion:file:setup.py]
+
+[bumpversion:file:conda.recipe/meta.yaml]
+
+[bumpversion:file:src/runtime/resources/clr.py]
+
+[bumpversion:file:src/SharedAssemblyInfo.cs]
+serialize = 
+	{major}.{minor}.{patch}
+
+[bumpversion:file:src/clrmodule/ClrModule.cs]
+serialize = 
+	{major}.{minor}.{patch}
+
diff --git a/.editorconfig b/.editorconfig
@@ -16,9 +16,14 @@ trim_trailing_whitespace = true
 indent_size = 2

 # Xml project files
-[*.{csproj,config,build,config}]
+[*.{csproj,pyproj,config}]
 indent_size = 2

 # Solution
 [*.sln]
 indent_style = tab
+
+# bumpversion reformats itself after every bump
+[.bumpversion.cfg]
+trim_trailing_whitespace = false
+indent_style = tab
diff --git a/.gitignore b/.gitignore
@@ -54,3 +54,6 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
+
+# Coverity
+cov-int/
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,7 @@ env:
    - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
    - SEGFAULT_SIGNALS=all
    - PYTHONUNBUFFERED=True
+    - CODECOV_ENV=TRAVIS_PYTHON_VERSION

 addons:
  apt:
@@ -28,21 +29,28 @@ addons:
      - mono-devel
      - ca-certificates-mono

+before_install:
+  # Set-up dll path for embedded tests
+  - PY_LIBDIR=$(python -c 'import sysconfig; print(sysconfig.get_config_var("LIBDIR"))')
+  - export LD_LIBRARY_PATH=$PY_LIBDIR:$LD_LIBRARY_PATH
+
 install:
-  - pip install pycparser coverage codecov
-  - coverage run setup.py build_ext --inplace
+  - pip install --upgrade -r requirements.txt
+  - coverage run setup.py install

 script:
-  - export PYTHONPATH=`pwd`:$PYTHONPATH
-  - python src/tests/runtests.py
-  # - mono ./packages/NUnit.Runners*/tools/nunit-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll
+  - python -m pytest
+  - mono ./packages/NUnit.*/tools/nunit3-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll

-after_success:
+after_script:
  # Uncomment if need to geninterop, ie. py37 final
  # - python tools/geninterop/geninterop.py

-  # Waiting on mono-cov support or SharpCover
-  - codecov
+  # Waiting on mono-coverage, SharpCover or xr.Baboon
+  - coverage xml -i
+  - codecov --file coverage.xml --flags setup_linux

 notifications:
  email: false
+  slack:
+    secure: "UiQdSK1/uNnHl8/gQgfLj/F5JGxtJuaT3QYtKNcw3Ddpr3FX8tfXJ/RjsCsSlRQzDm7AdBAeMzcBQmvH4iRIV2y7qVywLyru5MPiwY4ZjMN6fJK/zaaxetOct9fasIBYzHguNPDAtiBGFh2iK1H1MXTY8rkmU3WZvl18b8EsrP0="
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -12,11 +12,14 @@

 ## Contributors

+-   Arvid JB ([@ArvidJB](https://github.com/ArvidJB))
 -   Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich))
 -   Christian Heimes ([@tiran](https://github.com/tiran))
 -   Christoph Gohlke ([@cgohlke](https://github.com/cgohlke))
+-   Daniel Fernandez ([@fdanny](https://github.com/fdanny))
 -   Daniel Santana ([@dgsantana](https://github.com/dgsantana))
 -   David Lechner ([@dlech](https://github.com/dlech))
+-   Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
 -   He-chien Tsai ([@t3476](https://github.com/t3476))
 -   Jeff Reback ([@jreback](https://github.com/jreback))
 -   Joe Frayne ([@jfrayne](https://github.com/jfrayne))
@@ -29,12 +32,10 @@
 -   Sean Freitag ([@cowboygneox](https://github.com/cowboygneox))
 -   Serge Weinstock ([@sweinst](https://github.com/sweinst))
 -   Virgil Dupras ([@hsoft](https://github.com/hsoft))
+-   Wenguang Yang ([@yagweb](https://github.com/yagweb))
 -   Xavier Dupré ([@sdpython](https://github.com/sdpython))
 -   Zane Purvis ([@zanedp](https://github.com/zanedp))
-   ([@ArvidJB](https://github.com/ArvidJB))
 -   ([@bltribble](https://github.com/bltribble))
-   ([@dmitriyse](https://github.com/dmitriyse))
-   ([@fdanny](https://github.com/fdanny))
 -   ([@omnicognate](https://github.com/omnicognate))
 -   ([@rico-chet](https://github.com/rico-chet))
 -   ([@rmadsen-ks](https://github.com/rmadsen-ks))

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,29 +9,78 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].

 ### Added

-   Code Coverage (#345)
-   Added `pysetargv` (#347)
+-   Added `Foo` feature
+
+### Changed
+
+-   Changed `Bar` feature
+
+### Fixed
+
+-   Fixed `FooBar` bug
+
+## [2.3.0][] - 2017-03-11
+
+### Added
+
+-   Added Code Coverage (#345)
+-   Added `PySys_SetArgvEx` (#347)
 -   Added XML Documentation (#349)
-   Added Embedded tests on Appveyor (#353)
-   Added PY3 settings to configuration-manager (#346)
+-   Added `Embedded_Tests` on AppVeyor (#224)(#353)
+-   Added `Embedded_Tests` on Travis (#224)(#391)
+-   Added PY3 settings to solution configuration-manager (#346)
+-   Added `Slack` (#384)(#383)(#386)
+-   Added function of passing an arbitrary .NET object as the value
+    of an attribute of `PyObject` (#370)(#373)
+-   Added `Coverity scan` (#390)
+-   Added `bumpversion` for version control (#319)(#398)
+-   Added `tox` for local testing (#345)
+-   Added `requirements.txt`
+-   Added to `PythonEngine` methods `Eval` and `Exec` (#389)
+-   Added implementations of `ICustomMarshal` (#407)
+-   Added docker images (#322)
+-   Added hooks in `pyinstaller` and `cx_freeze` for `pythonnet` (#66)

 ### Changed

-   Refactored `setup.py` (#337)
-   Upgraded NUnit framework to 2.6.4 (#353)
-   Completed refactor of Build Directives on `Runtime.cs` (#339)
-   Refactor python unittests (#329)
+-   Refactored python `unittests` (#329)
+-   Refactored python `setup.py` (#337)
+-   Refactored remaining of Build Directives on `runtime.cs` (#339)
+-   Refactored `Embedded_Tests` to make easier to write tests (#369)
+-   Changed `unittests` to `pytest` (#368)
+-   Upgraded NUnit framework from `2.6.3` to `3.5.0` (#341)
+-   Downgraded NUnit framework from `3.5.0` to `2.6.4` (#353)
+-   Upgraded NUnit framework from `2.6.4` to `3.6.0` (#371)
 -   Unfroze Mono version on Travis (#345)
+-   Changed `conda.recipe` build to only pull-requests (#345)
+-   Combine `Py_DEBUG` and `PYTHON_WITH_PYDEBUG` flags (#362)
+
+### Deprecated
+
+-   Deprecated `RunString` (#401)

 ### Fixed

-   Fixed crash during Initialization (#343)
+-   Fixed crash during Initialization (#262)(#343)
 -   Fixed crash during Shutdown (#365)
+-   Fixed multiple build warnings
+-   Fixed method signature match for Object Type (#203)(#377)
+-   Fixed outdated version number in AssemblyInfo (#398)
+-   Fixed wrong version number in `conda.recipe` (#398)
+-   Fixed fixture location for Python tests and `Embedded_Tests`
+-   Fixed `PythonException` crash during Shutdown (#400)
+-   Fixed `AppDomain` unload during GC (#397)(#400)
+-   Fixed `Py_Main` & `PySys_SetArgvEx` `no mem error` on `UCS4/PY3` (#399)
+-   Fixed `Python.Runtime.dll.config` on macOS (#120)
+-   Fixed crash on `PythonEngine.Version` (#413)
+-   Fixed `PythonEngine.PythonPath` issues (#179)(#414)(#415)

 ### Removed

-   Removed `six` dependency for unittests (#329)
+-   Removed `six` dependency for `unittests` (#329)
 -   Removed `Mono.Unix` dependency for `UCS4` (#360)
+-   Removed need for `Python.Runtime.dll.config`
+-   Removed PY32 build option `PYTHON_WITH_WIDE_UNICODE` (#417)

 ## [2.2.2][] - 2017-01-29

@@ -41,7 +90,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].

 ## [2.2.1][] - 2017-01-26

-`v2.2.0` had a release issue on pypi. Bumped to `v2.2.1`
+-   `v2.2.0` had a release issue on PyPi. Bumped to `v2.2.1`

 ### Added

@@ -107,7 +156,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].

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

-    Release
+-   Release

 ## 2.0.0-alpha.2

@@ -508,7 +557,9 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].

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

-[unreleased]: ../../compare/v2.2.2...HEAD
+[unreleased]: ../../compare/v2.3.0...HEAD
+
+[2.3.0]: ../../compare/v2.2.2...v2.3.0

 [2.2.2]: ../../compare/v2.2.1...v2.2.2


diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2017 the contributors of the "Python for .NET" project
+Copyright (c) 2006-2017 the contributors of the "Python for .NET" project

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

diff --git a/Python.Runtime.dll.config b/Python.Runtime.dll.config
diff --git a/README.md b/README.md
@@ -3,9 +3,13 @@
 [![appveyor shield][]](https://ci.appveyor.com/project/pythonnet/pythonnet/branch/master)
 [![travis shield][]](https://travis-ci.org/pythonnet/pythonnet)
 [![codecov shield][]](https://codecov.io/github/pythonnet/pythonnet)
+[![coverity shield][]](https://scan.coverity.com/projects/pythonnet)
+
 [![license shield][]](./LICENSE)
 [![pypi package version][]](https://pypi.python.org/pypi/pythonnet)
 [![python supported shield][]](https://pypi.python.org/pypi/pythonnet)
+[![stackexchange shield][]](http://stackoverflow.com/questions/tagged/python.net)
+[![slack][]](https://pythonnet.slack.com)

 Python for .NET is a package that gives Python programmers nearly
 seamless integration with the .NET Common Language Runtime (CLR) and
@@ -35,14 +39,14 @@ from System.Windows.Forms import Form
 ## Embedding Python in .NET

 -   All calls to python should be inside
-    a `using (Py.GIL()) {/_ Your code here _/}` block.
+    a `using (Py.GIL()) {/* Your code here */}` block.
 -   Import python modules using `dynamic mod = Py.Import("mod")`,
    then you can call functions as normal, eg `mod.func(args)`.
 -   Use `mod.func(args, Py.kw("keywordargname", keywordargvalue))`
    to apply keyword arguments.
 -   All python objects should be declared as `dynamic` type.
 -   Mathematical operations involving python and literal/managed types must
-    have the python object first, eg `np.pi_2` works, `2_np.pi` doesn't.
+    have the python object first, eg. `np.pi * 2` works, `2 * np.pi` doesn't.

 ### Example

@@ -52,17 +56,21 @@ static void Main(string[] args)
    using (Py.GIL())
    {
        dynamic np = Py.Import("numpy");
+        Console.WriteLine(np.cos(np.pi * 2));
+
        dynamic sin = np.sin;
-        Console.WriteLine(np.cos(np.pi*2));
        Console.WriteLine(sin(5));
+
        double c = np.cos(5) + sin(5);
        Console.WriteLine(c);
-        /* this block is temporarily disabled due to regression
+
        dynamic a = np.array(new List<float> { 1, 2, 3 });
-        dynamic b = np.array(new List<float> { 6, 5, 4 }, Py.kw("dtype", np.int32));
        Console.WriteLine(a.dtype);
+
+        dynamic b = np.array(new List<float> { 6, 5, 4 }, Py.kw("dtype", np.int32));
        Console.WriteLine(b.dtype);
-        Console.WriteLine(a * b); */
+
+        Console.WriteLine(a * b);
        Console.ReadKey();
    }
 }
@@ -76,17 +84,23 @@ Output:
 -0.6752620892
 float64
 int32
-[6.  10.  12.]
+[  6.  10.  12.]
 ```

 [appveyor shield]: https://img.shields.io/appveyor/ci/pythonnet/pythonnet/master.svg?label=AppVeyor

-[codecov shield]: https://img.shields.io/codecov/c/github/pythonnet/pythonnet/master.svg?label=codecov
+[codecov shield]: https://img.shields.io/codecov/c/github/pythonnet/pythonnet/master.svg?label=Codecov
+
+[coverity shield]: https://img.shields.io/coverity/scan/7830.svg

 [license shield]: https://img.shields.io/badge/license-MIT-blue.svg?maxAge=3600

 [pypi package version]: https://img.shields.io/pypi/v/pythonnet.svg

 [python supported shield]: https://img.shields.io/pypi/pyversions/pythonnet.svg

+[slack]: https://img.shields.io/badge/chat-slack-color.svg?style=social
+
+[stackexchange shield]: https://img.shields.io/badge/StackOverflow-python.net-blue.svg
+
 [travis shield]: https://img.shields.io/travis/pythonnet/pythonnet/master.svg?label=Travis