From 9f579f039020d25c86e4c7d09864281dd5a0e8e6 Mon Sep 17 00:00:00 2001 From: Victor Uriarte Date: Sat, 28 Jan 2017 16:59:57 -0700 Subject: [PATCH 1/3] Update CHANGELOG for development Clean-up/expand previous entries --- CHANGELOG.md | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7185e7c1f..1bd5a920c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,20 @@ This project adheres to [Semantic Versioning][]. This document follows the conventions laid out in [Keep a CHANGELOG][]. +## [unreleased][] + +### Added + +- New `Foo` feature + +### Changed + +- Changed `Bar` feature + +### Fixed + +- Fixed `FooBar` bug + ## [2.2.1][] - 2017-01-26 `v2.2.0` had a release issue on pypi. Bumped to `v2.2.1` @@ -27,32 +41,49 @@ This document follows the conventions laid out in [Keep a CHANGELOG][]. ### Removed -- Python 3.2 support -- Python 3.3 support +- Python 2.6 support (#270) +- Python 3.2 support (#270) ### Fixed - Fixed `isinstance` refcount_leak (#273) +- Comparison Operators (#294) +- Improved Linux support (#300) +- Exception pickling (#286) ## [2.2.0-dev1][] - 2016-09-19 +### Changed + - Switch to C# 6.0 (#219) -- Relative imports (#219) -- Recursive types (#250) -- Demo fix - stream reading (#225) -- setup.py improvements for locating build tools (#208) +- `setup.py` improvements for locating build tools (#208) - unmanaged exports updated (#206) - Mono update pinned to 4.2.4.4 (#233) +### Fixed + +- Fixed relative imports (#219) +- Fixed recursive types (#250) +- Demo fix - stream reading (#225) + ## [2.1.0][] - 2016-04-12 ### Added -- Added Python 3.x support. +- Added Python 3.2 support. (#78) +- Added Python 3.3 support. (#78) +- Added Python 3.4 support. (#78) +- Added Python 3.5 support. (#163) +- Managed types can be sub-classed in Python (#78) +- Uses dynamic objects for cleaner code when embedding Python (#78) + +### Changed + +- Better Linux support (with or without --enable-shared option) (#78) ### Removed -- Implicit Type Casting. +- Implicit Type Casting (#131) ## [2.0.0][] - 2015-06-26 From d119d1b5910bca724e8a36f619b3747ee88ed222 Mon Sep 17 00:00:00 2001 From: denfromufa Date: Sat, 28 Jan 2017 23:41:39 -0600 Subject: [PATCH 2/3] include fake c libs for pycparser to work --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9ad4178bd..7850e48a8 100644 --- a/setup.py +++ b/setup.py @@ -327,7 +327,7 @@ def _get_interop_filename(): sources.append(os.path.join(root, filename)) for root, dirnames, filenames in os.walk("tools"): - for ext in (".exe", ".py"): + for ext in (".exe", ".py", ".c", ".h"): for filename in fnmatch.filter(filenames, "*" + ext): sources.append(os.path.join(root, filename)) From c95b8f3fdcda1957b4d6e499a7dd5d3f0e1b51c8 Mon Sep 17 00:00:00 2001 From: Victor Uriarte Date: Sat, 28 Jan 2017 23:24:59 -0700 Subject: [PATCH 3/3] Update CHANGELOG for v2.2.2 --- CHANGELOG.md | 16 +++++----------- appveyor.yml | 2 +- setup.py | 2 +- src/runtime/resources/clr.py | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bd5a920c..4515cde20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,19 +5,11 @@ This project adheres to [Semantic Versioning][]. This document follows the conventions laid out in [Keep a CHANGELOG][]. -## [unreleased][] - -### Added - -- New `Foo` feature - -### Changed - -- Changed `Bar` feature +## [2.2.2][] - 2017-01-29 ### Fixed -- Fixed `FooBar` bug +- Missing files from packaging (#336) ## [2.2.1][] - 2017-01-26 @@ -488,7 +480,9 @@ This document follows the conventions laid out in [Keep a CHANGELOG][]. [semantic versioning]: http://semver.org/ -[unreleased]: ../../compare/v2.2.1...HEAD +[unreleased]: ../../compare/v2.2.2...HEAD + +[2.2.2]: ../../compare/v2.2.1...v2.2.2 [2.2.1]: ../../compare/v2.2.0-dev1...v2.2.1 diff --git a/appveyor.yml b/appveyor.yml index 5f6a0a842..2b0408bf9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.2.1-build{build} +version: '{branch}-{build}' platform: - x86 diff --git a/setup.py b/setup.py index 7850e48a8..f8409799a 100644 --- a/setup.py +++ b/setup.py @@ -338,7 +338,7 @@ def _get_interop_filename(): setup( name="pythonnet", - version="2.2.1", + version="2.2.2", description=".Net and Mono integration for Python", url='https://pythonnet.github.io/', license='MIT', diff --git a/src/runtime/resources/clr.py b/src/runtime/resources/clr.py index 805b0e23b..c329b1f6d 100644 --- a/src/runtime/resources/clr.py +++ b/src/runtime/resources/clr.py @@ -2,7 +2,7 @@ Code in this module gets loaded into the main clr module. """ -__version__ = "2.2.1" +__version__ = "2.2.2" class clrproperty(object):