Skip to content

Commit d1fb167

Browse files
committed
Updated license text to reflect Personal and Educational licenses.
1 parent 5cbd4ca commit d1fb167

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

LICENSE

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Without prejudice to the limited right to download and test the Wrapper for eval
1818

1919
A Wrapper License (as defined below) or renewal thereof can only be purchased by a Licensee either already holding a License to the Software, or at the same time as purchasing such a License, as an add-on product to such License, and only by a Licensee holding an active and valid enrolment in the Highcharts Advantage plan. The purchase of, and right to use the Licensed Software shall remain governed by the terms and conditions of the License issued by Highsoft to Licensee, whether this is Highsoft Standard License Agreement, Highsoft Terms and Conditions for Subscription to Annual License to Highsoft Software, or another licensing agreement as agreed between Highsoft and Licensee, as applicable (such terms and conditions between Highsoft and Licensee hereinafter collectively referred to as the “Main Agreement”).
2020

21+
A Wrapper License (as defined below) can additionally be obtained by holding an active and valid Educational or Personal License to the Software. The right to use the Licensed Software shall remain governed by the terms and conditions of the Authorized User issued by Highsoft to Authorized User, as defined in the Educational and Personal License 1.0, (such terms and conditions between Highsoft and Authorized User hereinafter collectively referred to as the "Main Agreement").
22+
2123
These Wrapper T&Cs constitute an addendum to the Main Agreement and an integral part thereof and apply to the use of the Wrapper only.
2224

2325
In the case of any discrepancy between the Main Agreement and these Wrapper T&Cs related to the licensing of the Wrapper, these Wrapper T&Cs shall prevail.
@@ -86,13 +88,16 @@ Licensee shall not modify, delete or obscure any notices of proprietary rights o
8688
6. Wrapper Support
8789
***********************************************
8890

89-
A Wrapper License entitles Licensee to the support services and access to new Releases of the Wrapper as set out herein. While support for the Wrapper is contingent upon Licensee’s valid enrollment in the Highcharts Advantage plan and the annual number of hours of support available for support of the Licensed Software for each successive twelve month term during the period that Licensee is enrolled in Highcharts Advantage (each, a “Support Year”) are inclusive of the number of hours of support offered during such Support Year for the Wrapper, support of the Wrapper is not covered under Licensee’s enrollment in Highcharts Advantage, but is offered by Highsoft for a separate fee and provided separately, directly and independently by HCP.
91+
A Wrapper License entitles Licensee to the support services and access to new Releases of the Wrapper as set out herein. While support for the Wrapper is contingent upon Licensee’s valid enrollment in the Highcharts Advantage plan and the annual number of hours of support available for support of the Licensed Software for each successive twelve month term during the period that Licensee is enrolled in Highcharts Advantage (each, a “Support Year”) are inclusive of the number of hours of support offered during such Support Year for the Wrapper, support of the Wrapper is not covered under Licensee’s enrollment in Highcharts Advantage, but is offered by Highsoft for a separate fee and provided separately, directly and independently by HCP. In the event that the Licensee is not enrolled in the Highcharts Advantage Plan, for example if the Main Agreement grants the Licensee a Personal or Educational License, then the Licensee shall not be entitled to the support services outlined herein.
9092

9193
All support inquiries related to the Wrapper shall be sent to [email protected] or filed at https://www.highchartspython.com.
9294

93-
Under a valid and effective Wrapper License, Licensee shall be entitled to receive from HCP:
95+
Under a valid and effective Wrapper License, Licensee shall be entitled to receive from HCP:
9496

9597
i. All new releases or updates of the Wrapper released during the applicable Advantage Period;
98+
99+
Under a valid and effective Wrapper License, contingent upon the Licensee’s valid enrollment in the Highcharts Advantage Plan and payment of applicable fees, Licensee shall be entitled to receive from HCP:
100+
96101
ii. Up to ten (10) hours of the personalized technical support for the Wrapper and/or the Licensed Software
97102
(combined) per Developer per Support Year based on the number of Developers stated in the License Statement for
98103
the License. Licensee may freely distribute its included total of ten (10) hours of personalized technical

docs/license.rst

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ Terms and Conditions for the Highcharts for Python Toolkit License
44

55
.. warning::
66

7-
The **Highcharts for Python Toolkit** as a whole, and the **Highcharts Core for Python** library specifically,
7+
The **Highcharts for Python Toolkit** as a whole, and the **Highcharts Maps for Python** library specifically,
88
are made available subject to a *paid* commercial license. This means that while the code is open-source, in order
99
to use it you **must** purchase a license from `Highsoft A/S <https://www.highcharts.com>`__, the
1010
creators of the Highcharts JavaScript library.
1111

1212
**TO PURCHASE A LICENSE:** `https://shop.highcharts.com/ <https://shop.highcharts.com/>`__
13+
**TO APPLY FOR A PERSONAL / EDUCATIONAL LICENSE:** `https://shop.highcharts.com/contact/educational <https://shop.highcharts.com/contact/educational>`__
1314

1415
***********************************************
1516
1. Acceptance of the Terms and Conditions
@@ -27,6 +28,8 @@ Without prejudice to the limited right to download and test the Wrapper for eval
2728

2829
A Wrapper License (as defined below) or renewal thereof can only be purchased by a Licensee either already holding a License to the Software, or at the same time as purchasing such a License, as an add-on product to such License, and only by a Licensee holding an active and valid enrolment in the Highcharts Advantage plan. The purchase of, and right to use the Licensed Software shall remain governed by the terms and conditions of the License issued by Highsoft to Licensee, whether this is Highsoft Standard License Agreement, Highsoft Terms and Conditions for Subscription to Annual License to Highsoft Software, or another licensing agreement as agreed between Highsoft and Licensee, as applicable (such terms and conditions between Highsoft and Licensee hereinafter collectively referred to as the “Main Agreement”).
2930

31+
A Wrapper License (as defined below) can additionally be obtained by holding an active and valid Educational or Personal License to the Software. The right to use the Licensed Software shall remain governed by the terms and conditions of the Authorized User issued by Highsoft to Authorized User, as defined in the Educational and Personal License 1.0, (such terms and conditions between Highsoft and Authorized User hereinafter collectively referred to as the "Main Agreement").
32+
3033
These Wrapper T&Cs constitute an addendum to the Main Agreement and an integral part thereof and apply to the use of the Wrapper only.
3134

3235
In the case of any discrepancy between the Main Agreement and these Wrapper T&Cs related to the licensing of the Wrapper, these Wrapper T&Cs shall prevail.
@@ -95,13 +98,16 @@ Licensee shall not modify, delete or obscure any notices of proprietary rights o
9598
6. Wrapper Support
9699
***********************************************
97100

98-
A Wrapper License entitles Licensee to the support services and access to new Releases of the Wrapper as set out herein. While support for the Wrapper is contingent upon Licensees valid enrollment in the Highcharts Advantage plan and the annual number of hours of support available for support of the Licensed Software for each successive twelve month term during the period that Licensee is enrolled in Highcharts Advantage (each, a “Support Year”) are inclusive of the number of hours of support offered during such Support Year for the Wrapper, support of the Wrapper is not covered under Licensee’s enrollment in Highcharts Advantage, but is offered by Highsoft for a separate fee and provided separately, directly and independently by HCP.
101+
A Wrapper License entitles Licensee to the support services and access to new Releases of the Wrapper as set out herein. While support for the Wrapper is contingent upon Licensee's valid enrollment in the Highcharts Advantage plan and the annual number of hours of support available for support of the Licensed Software for each successive twelve month term during the period that Licensee is enrolled in Highcharts Advantage (each, a “Support Year”) are inclusive of the number of hours of support offered during such Support Year for the Wrapper, support of the Wrapper is not covered under Licensee’s enrollment in Highcharts Advantage, but is offered by Highsoft for a separate fee and provided separately, directly and independently by HCP. In the event that the Licensee is not enrolled in the Highcharts Advantage Plan, for example if the Main Agreement grants the Licensee a Personal or Educational License, then the Licensee shall not be entitled to the support services outlined herein.
99102

100103
All support inquiries related to the Wrapper shall be sent to [email protected] or filed at https://www.highchartspython.com.
101104

102-
Under a valid and effective Wrapper License, Licensee shall be entitled to receive from HCP:
105+
Under a valid and effective Wrapper License, Licensee shall be entitled to receive from HCP:
103106

104107
i. All new releases or updates of the Wrapper released during the applicable Advantage Period;
108+
109+
Under a valid and effective Wrapper License, contingent upon the Licensee’s valid enrollment in the Highcharts Advantage Plan and payment of applicable fees, Licensee shall be entitled to receive from HCP:
110+
105111
ii. Up to ten (10) hours of the personalized technical support for the Wrapper and/or the Licensed Software
106112
(combined) per Developer per Support Year based on the number of Developers stated in the License Statement for
107113
the License. Licensee may freely distribute its included total of ten (10) hours of personalized technical

0 commit comments

Comments
 (0)