Skip to content

Commit

Permalink
pushes version number (again)
Browse files Browse the repository at this point in the history
  • Loading branch information
MAKOMO committed Nov 29, 2019
1 parent 667b85b commit a111328
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2.1.1.{build}'
version: '2.1.2.{build}'

branches:
only:
Expand All @@ -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%
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion src/artisanlib/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

__version__ = '2.1.1'
__version__ = '2.1.2'
__revision__ = '0'
__build__ = '0'
6 changes: 6 additions & 0 deletions src/debian/usr/share/doc/artisan/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
artisan (2.1.0-0) precise; urgency=low
* new upstream release
* changes since 2.0.0:
- bug fixes
-- <[email protected]> Fri, 29 Nov 2019 19:32:14 +0200

artisan (2.1.0-0) precise; urgency=low
* new upstream release
* changes since 2.0.0:
Expand Down
2 changes: 1 addition & 1 deletion src/setup-install.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/setup-install3-pi.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/setup-install3.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 9 additions & 0 deletions wiki/ReleaseHistory.md
Original file line number Diff line number Diff line change
@@ -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)
------------------
Expand Down

0 comments on commit a111328

Please sign in to comment.