diff --git a/.appveyor.yml b/.appveyor.yml index 4df7cb4e2..fe7d5d025 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: '2.1.1.{build}' +version: '2.1.2.{build}' branches: only: @@ -12,7 +12,7 @@ environment: matrix: - PYTHON: "C:\\Python37-x64" PYTHON_VERSION: 3.7 - ARTISAN_VERSION: 2.1.1 + ARTISAN_VERSION: 2.1.2 install: - set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH% diff --git a/README.md b/README.md index 9aaa64b3c..d43647536 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ Version History | Version | Date | Comment | |---------|------:|---------| +| v2.1.1 | 29.11.2019 | Bug fixes | | v2.1.0 | 26.11.2019 | Adds curve analyzer, extended symbolic formulas, forward looking alarms and alarms triggered by temperature differences, support for the [Atilla](https://www.atilla.com.br/) GOLD plus 7" II, the [Besca Bee sample roaster](https://www.bescaroasters.com/roaster-detail/14/Sample-Roasters/Besca-Bee-Coffee-Roaster), additional [Coffed](https://coffed.pl/en) machines (SR3/5/15/25/60), [Coffeetool Rxx](https://coffeetool.gr/product-category/coffeeroasters/) machines with control, and popular [popular Phidget sets](https://artisan-scope.org/devices/phidget-sets/) (incl. the one feature in [On Idle Noise](https://artisan-roasterscope.blogspot.com/2019/03/on-idle-noise.html)) | | v2.0.0 | 04.06.2019 | New icon and new look! Adds support for the [artisan.plus](https://artisan.plus/) inventory management service, [Coffee-Tech Engineering Silon ZR7](https://www.coffee-tech.com/products/shop-roasters/silon-zr-7-shop-roaster/), [Has Garanti HGS and HSR series](http://www.hasgaranti.com.tr/en/products/shop-type-products/shop-type-roasting-coffee-machine.html), [Kaldi Fortis](https://eng.homecaffe.net/product/kaldi-fortis-grande-coffee-roaster/126/category/223/display/1/), and the forthcoming [Behmor 1kg](https://behmor.com/jake-kilo-roaster/) | | v1.6.2 | 20.03.2019 | Enables communication with Phidgets under the Mac OS X 10.14 security framework | diff --git a/src/artisanlib/__init__.py b/src/artisanlib/__init__.py index 0a8123ef1..9ef92ea99 100755 --- a/src/artisanlib/__init__.py +++ b/src/artisanlib/__init__.py @@ -1,4 +1,4 @@ -__version__ = '2.1.1' +__version__ = '2.1.2' __revision__ = '0' __build__ = '0' diff --git a/src/debian/usr/share/doc/artisan/changelog b/src/debian/usr/share/doc/artisan/changelog index e72885f30..ac0ccedc3 100644 --- a/src/debian/usr/share/doc/artisan/changelog +++ b/src/debian/usr/share/doc/artisan/changelog @@ -1,3 +1,9 @@ +artisan (2.1.0-0) precise; urgency=low + * new upstream release + * changes since 2.0.0: + - bug fixes + -- Fri, 29 Nov 2019 19:32:14 +0200 + artisan (2.1.0-0) precise; urgency=low * new upstream release * changes since 2.0.0: diff --git a/src/setup-install.nsi b/src/setup-install.nsi index c501e5948..c8a544198 100644 --- a/src/setup-install.nsi +++ b/src/setup-install.nsi @@ -73,7 +73,7 @@ RequestExecutionLevel admin ; HM NIS Edit Wizard helper defines !define py2exeOutputDir 'dist' !define PRODUCT_NAME "Artisan" -!define PRODUCT_VERSION "2.1.1.0" +!define PRODUCT_VERSION "2.1.2.0" !define PRODUCT_PUBLISHER "The Artisan Team" !define PRODUCT_WEB_SITE "https://github.com/artisan-roaster-scope/artisan/blob/master/README.md" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\artisan.exe" diff --git a/src/setup-install3-pi.nsi b/src/setup-install3-pi.nsi index 9066a579d..1fbd33f19 100755 --- a/src/setup-install3-pi.nsi +++ b/src/setup-install3-pi.nsi @@ -73,7 +73,7 @@ RequestExecutionLevel admin ; HM NIS Edit Wizard helper defines !define pyinstallerOutputDir 'dist/artisan' !define PRODUCT_NAME "Artisan" -!define PRODUCT_VERSION "2.1.1.0" +!define PRODUCT_VERSION "2.1.2.0" !define PRODUCT_PUBLISHER "The Artisan Team" !define PRODUCT_WEB_SITE "https://github.com/artisan-roaster-scope/artisan/blob/master/README.md" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\artisan.exe" diff --git a/src/setup-install3.nsi b/src/setup-install3.nsi index ca41ebda5..29495c4c7 100755 --- a/src/setup-install3.nsi +++ b/src/setup-install3.nsi @@ -73,7 +73,7 @@ RequestExecutionLevel admin ; HM NIS Edit Wizard helper defines !define py2exeOutputDir 'dist' !define PRODUCT_NAME "Artisan" -!define PRODUCT_VERSION "2.1.1.0" +!define PRODUCT_VERSION "2.1.2.0" !define PRODUCT_PUBLISHER "The Artisan Team" !define PRODUCT_WEB_SITE "https://github.com/artisan-roaster-scope/artisan/blob/master/README.md" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\artisan.exe" diff --git a/wiki/ReleaseHistory.md b/wiki/ReleaseHistory.md index 035cd05b6..2e657adb6 100644 --- a/wiki/ReleaseHistory.md +++ b/wiki/ReleaseHistory.md @@ -1,6 +1,15 @@ Detailed Release History ======================== +---- +v2.1.1 (29.11.2019) +------------------ + +* Fixes + - fixes DROP action, broken in v2.1 + - fixes S7 communication, broken in v2.1 + - fixes rare issue with the exit handler + ---- v2.1.0 (26.11.2019) ------------------