From da5a7a711a77e4e3d4e224a60cfb7668ed1d6113 Mon Sep 17 00:00:00 2001 From: David Brown Date: Wed, 13 Nov 2019 09:29:58 -0800 Subject: [PATCH 1/2] Add Changelog v0.12.3 Fix #263 Signed-off-by: David Brown --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d43f0a3..a93dd78e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Endpoints for querying for status of data - Endpoints for querying for reporting of data +## [0.12.3] - 2019-11-13 +### Changed +- Fix #262 Add OrderedDict hashlist creation by [@kauberry](https://github.com/kauberry) + ## [0.12.2] - 2019-10-31 ### Changed - Fix #258 Add more handling of hashlist creation by [@kauberry](https://github.com/kauberry) From 59839498bd34dae990f1a0f9f5a3f31a3b02603d Mon Sep 17 00:00:00 2001 From: David Brown Date: Wed, 13 Nov 2019 09:51:46 -0800 Subject: [PATCH 2/2] Minor Appveyor fix Signed-off-by: David Brown --- appveyor.yml | 1 + tests/core/cmd_test.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index ae144038..76038025 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,6 +22,7 @@ install: Expand-Archive "elasticsearch.zip" -DestinationPath "C:\elasticsearch"; C:\pacifica\Scripts\activate.ps1; python -m pip install --upgrade pip setuptools wheel; + python -m pip install pywin32==225; python -m pip install -r requirements-dev.txt; python -m pip install 'celery[eventlet]' eventlet; echo 'Done'; diff --git a/tests/core/cmd_test.py b/tests/core/cmd_test.py index f1f3d00f..a8e3f8a7 100644 --- a/tests/core/cmd_test.py +++ b/tests/core/cmd_test.py @@ -130,6 +130,8 @@ def _load_metadata(cls, version): def _upgrade_path(cls, *versions): cls._upgrade_package('pip', 'setuptools', 'wheel') cls._install_package('elasticsearch<7') + if sys.platform == 'win32': + cls._install_package('pywin32!=226') for version in versions: cls._install_metadata(version) if versions: