Skip to content

Commit 73534dc

Browse files
committed
push version
1 parent d000cbd commit 73534dc

File tree

8 files changed

+19
-9
lines changed

8 files changed

+19
-9
lines changed

.appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '2.0.1.{build}'
1+
version: '2.1.0.{build}'
22

33
branches:
44
only:
@@ -12,7 +12,7 @@ environment:
1212
matrix:
1313
- PYTHON: "C:\\Python37-x64"
1414
PYTHON_VERSION: 3.7
15-
ARTISAN_VERSION: 2.0.1
15+
ARTISAN_VERSION: 2.1.0
1616

1717
install:
1818
- set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Version History
4949

5050
| Version | Date | Comment |
5151
|---------|------:|---------|
52-
| v2.1.0 | xx.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 [Phidgets machine setups]([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)) |
52+
| 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 [Phidgets machine setups]([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)) |
5353
| 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/) |
5454
| v1.6.2 | 20.03.2019 | Enables communication with Phidgets under the Mac OS X 10.14 security framework |
5555
| v1.6.1 | 10.03.2019 | Adds support for the [Sedona Elite 2in1 roaster](http://www.buckeyecoffee.com/sedona-elite-roasters.html), the [Probat Roaster Middleware](https://www.probat.com/en/products/shoproaster/produkte/roasters/probatone-series/), the [Aillio R1](https://aillio.com/) v2 firmware incl. the new [IBTS IR sensor](https://medium.com/@aillio/the-start-of-something-39aa01d08fa9), the Phidgets [REL1000](https://www.phidgets.com/?tier=3&catid=46&pcid=39&prodid=966), [REL1100](https://www.phidgets.com/?tier=3&catid=46&pcid=39&prodid=720), [REL1101](https://www.phidgets.com/?tier=3&catid=46&pcid=39&prodid=721), and [DAQ1400](https://www.phidgets.com/?tier=3&catid=49&pcid=42&prodid=961), the Phidget RC Servo API ([Phidget RCC 1000](https://www.phidgets.com/?tier=3&catid=21&pcid=18&prodid=1015), [Phidget 1061](https://www.phidgets.com/?tier=3&catid=21&pcid=18&prodid=1032), and [Phidget 1066](https://www.phidgets.com/?tier=3&catid=21&pcid=18&prodid=1044)), the [Yocotopuce Meteo](http://www.yoctopuce.com/EN/products/usb-environmental-sensors/yocto-meteo-v2) ambient sensor and the (upcoming) [Yocotopuce IR](http://www.yoctopuce.com/EN/products/usb-environmental-sensors/yocto-temperature-ir) module, adds Brazilian portuguese translations and updated French translations, a number of internal improvements and bug fixes |

src/artisanlib/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

2-
__version__ = '2.0.1'
2+
__version__ = '2.1.0'
33
__revision__ = '0'
44
__build__ = '0'

src/debian/usr/share/doc/artisan/changelog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
artisan (2.1.0-0) precise; urgency=low
2+
* new upstream release
3+
* changes since 2.0.0:
4+
- adds curve analyzer
5+
- extended symbolic formulas
6+
- forward looking alarms triggered by temperature differences
7+
- support for Atilla GOLD plus 7" II, Besca Bee, more Coffed machines, Phidget sets
8+
- bug fixes
9+
-- <[email protected]> Tue, 25 Nov 2019 19:32:14 +0200
10+
111
artisan (2.0.0-0) precise; urgency=low
212
* new upstream release
313
* changes since 1.6.2:

src/setup-install.nsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ RequestExecutionLevel admin
7373
; HM NIS Edit Wizard helper defines
7474
!define py2exeOutputDir 'dist'
7575
!define PRODUCT_NAME "Artisan"
76-
!define PRODUCT_VERSION "2.0.1.0"
76+
!define PRODUCT_VERSION "2.1.0.0"
7777
!define PRODUCT_PUBLISHER "The Artisan Team"
7878
!define PRODUCT_WEB_SITE "https://github.com/artisan-roaster-scope/artisan/blob/master/README.md"
7979
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\artisan.exe"

src/setup-install3-pi.nsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ RequestExecutionLevel admin
7373
; HM NIS Edit Wizard helper defines
7474
!define pyinstallerOutputDir 'dist/artisan'
7575
!define PRODUCT_NAME "Artisan"
76-
!define PRODUCT_VERSION "2.0.1.0"
76+
!define PRODUCT_VERSION "2.1.0.0"
7777
!define PRODUCT_PUBLISHER "The Artisan Team"
7878
!define PRODUCT_WEB_SITE "https://github.com/artisan-roaster-scope/artisan/blob/master/README.md"
7979
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\artisan.exe"
@@ -269,7 +269,7 @@ Section Uninstall
269269
RMDir /r "$INSTDIR\translations"
270270
RMDir /r "$INSTDIR\Wheels"
271271

272-
RMDir /r "$INSTDIR\gevent-1.4.0-py3.6.egg-info"
272+
RMDir /r "$INSTDIR\gevent-1.4.0-py3.7.egg-info"
273273

274274
RMDir /r "$INSTDIR\gevent"
275275
RMDir /r "$INSTDIR\matplotlib"

src/setup-install3.nsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ RequestExecutionLevel admin
7373
; HM NIS Edit Wizard helper defines
7474
!define py2exeOutputDir 'dist'
7575
!define PRODUCT_NAME "Artisan"
76-
!define PRODUCT_VERSION "2.0.1.0"
76+
!define PRODUCT_VERSION "2.1.0.0"
7777
!define PRODUCT_PUBLISHER "The Artisan Team"
7878
!define PRODUCT_WEB_SITE "https://github.com/artisan-roaster-scope/artisan/blob/master/README.md"
7979
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\artisan.exe"

wiki/ReleaseHistory.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Detailed Release History
22
========================
33

44
----
5-
v2.1.0 (xx.11.2019)
5+
v2.1.0 (26.11.2019)
66
------------------
77

88
* New Features

0 commit comments

Comments
 (0)