Skip to content

Commit

Permalink
Merge branch 'master' into pyup-update-sphinx-2.3.1-to-3.0.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	requirements_dev.txt
  • Loading branch information
taaviteska committed Apr 18, 2020
2 parents e115aec + 0dee13c commit 63b294c
Show file tree
Hide file tree
Showing 84 changed files with 381 additions and 222 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ python:
- 3.8
- 3.7
- 3.6
- 3.5

# Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
install:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.rst.
3. The pull request should work for Python 3.5, 3.6, 3.7 and 3.8, and for PyPy. Check
3. The pull request should work for Python 3.6, 3.7 and 3.8, and for PyPy. Check
https://travis-ci.org/thorgate/pyevr/pull_requests
and make sure that the tests pass for all supported Python versions.

Expand Down
2 changes: 1 addition & 1 deletion openapi/Dockerfile-openapi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openapitools/openapi-generator-cli:v4.2.3
FROM openapitools/openapi-generator-cli:v4.3.0

COPY update_schema.sh /helpers/update_schema.sh
RUN chmod +x /helpers/update_schema.sh
Expand Down
1 change: 1 addition & 0 deletions pyevr/docs/AssortmentsApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down
2 changes: 1 addition & 1 deletion pyevr/docs/CertificateClaim.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**code** | **str** | Tarneahela sertifikaadi väite kood |
**code** | **str** | [Tarneahela sertifikaadi väite kood](#operation/Certificates_List) |
**number** | **str** | Sertifikaadi number | [optional]

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
Expand Down
1 change: 1 addition & 0 deletions pyevr/docs/CertificatesApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down
1 change: 1 addition & 0 deletions pyevr/docs/MeasurementUnitsApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down
2 changes: 2 additions & 0 deletions pyevr/docs/MeasurementsApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down Expand Up @@ -104,6 +105,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down
1 change: 1 addition & 0 deletions pyevr/docs/OrganizationsApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down
3 changes: 3 additions & 0 deletions pyevr/docs/PlaceOfDeliveriesApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down Expand Up @@ -103,6 +104,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down Expand Up @@ -172,6 +174,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down
2 changes: 1 addition & 1 deletion pyevr/docs/ShipmentAssortment.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**code** | **str** | Sortimendi kood |
**code** | **str** | Sortimendi kood. Kui organisatsioon on seadistatud kasutama EVR sortimente, peab kood olema [üks EVR sortimentide koodist.](#operation/Assortments_List) |
**name** | **str** | Sortimendi nimetus |
**product_group** | **str** | Tootegrupi kood |

Expand Down
2 changes: 1 addition & 1 deletion pyevr/docs/ShipmentItem.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**amount** | **float** | Kogus |
**pack** | [**Pack**](Pack.md) | | [optional]
**unit_code** | **str** | Mõõtühiku kood |
**unit_code** | **str** | [Mõõtühiku kood](#operation/MeasurementUnits_List) |
**assortment** | [**ShipmentAssortment**](ShipmentAssortment.md) | |

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
Expand Down
7 changes: 7 additions & 0 deletions pyevr/docs/WaybillsApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down Expand Up @@ -108,6 +109,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down Expand Up @@ -179,6 +181,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down Expand Up @@ -248,6 +251,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down Expand Up @@ -339,6 +343,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down Expand Up @@ -408,6 +413,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down Expand Up @@ -477,6 +483,7 @@ configuration.api_key['EVR-APIKEY'] = 'YOUR_API_KEY'

# Defining host is optional and default to https://evr-test.azurewebsites.net
configuration.host = "https://evr-test.azurewebsites.net"

# Enter a context with an instance of the API client
with openapi_client.ApiClient(configuration) as api_client:
# Create an instance of the API class
Expand Down
2 changes: 1 addition & 1 deletion pyevr/openapi_client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
OpenAPI Generator'i jaoks kohandatud EVR API kirjeldus. Kasuta seda juhul, kui spetsifikatsioonile vastava EVR API kirjeldusega ei õnnestu klienti genereerida. # noqa: E501
The version of the OpenAPI document: 1.1
The version of the OpenAPI document: 1.1.1
Generated by: https://openapi-generator.tech
"""

Expand Down
21 changes: 14 additions & 7 deletions pyevr/openapi_client/api/assortments_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
OpenAPI Generator'i jaoks kohandatud EVR API kirjeldus. Kasuta seda juhul, kui spetsifikatsioonile vastava EVR API kirjeldusega ei õnnestu klienti genereerida. # noqa: E501
The version of the OpenAPI document: 1.1
The version of the OpenAPI document: 1.1.1
Generated by: https://openapi-generator.tech
"""

Expand All @@ -18,7 +18,7 @@
import six

from pyevr.openapi_client.api_client import ApiClient
from pyevr.openapi_client.exceptions import (
from pyevr.openapi_client.exceptions import ( # noqa: F401
ApiTypeError,
ApiValueError
)
Expand Down Expand Up @@ -90,11 +90,18 @@ def assortments_list_with_http_info(self, **kwargs): # noqa: E501

local_var_params = locals()

all_params = ['page', 'evr_language'] # noqa: E501
all_params.append('async_req')
all_params.append('_return_http_data_only')
all_params.append('_preload_content')
all_params.append('_request_timeout')
all_params = [
'page',
'evr_language'
]
all_params.extend(
[
'async_req',
'_return_http_data_only',
'_preload_content',
'_request_timeout'
]
)

for key, val in six.iteritems(local_var_params['kwargs']):
if key not in all_params:
Expand Down
21 changes: 14 additions & 7 deletions pyevr/openapi_client/api/certificates_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
OpenAPI Generator'i jaoks kohandatud EVR API kirjeldus. Kasuta seda juhul, kui spetsifikatsioonile vastava EVR API kirjeldusega ei õnnestu klienti genereerida. # noqa: E501
The version of the OpenAPI document: 1.1
The version of the OpenAPI document: 1.1.1
Generated by: https://openapi-generator.tech
"""

Expand All @@ -18,7 +18,7 @@
import six

from pyevr.openapi_client.api_client import ApiClient
from pyevr.openapi_client.exceptions import (
from pyevr.openapi_client.exceptions import ( # noqa: F401
ApiTypeError,
ApiValueError
)
Expand Down Expand Up @@ -90,11 +90,18 @@ def certificates_list_with_http_info(self, **kwargs): # noqa: E501

local_var_params = locals()

all_params = ['page', 'evr_language'] # noqa: E501
all_params.append('async_req')
all_params.append('_return_http_data_only')
all_params.append('_preload_content')
all_params.append('_request_timeout')
all_params = [
'page',
'evr_language'
]
all_params.extend(
[
'async_req',
'_return_http_data_only',
'_preload_content',
'_request_timeout'
]
)

for key, val in six.iteritems(local_var_params['kwargs']):
if key not in all_params:
Expand Down
21 changes: 14 additions & 7 deletions pyevr/openapi_client/api/measurement_units_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
OpenAPI Generator'i jaoks kohandatud EVR API kirjeldus. Kasuta seda juhul, kui spetsifikatsioonile vastava EVR API kirjeldusega ei õnnestu klienti genereerida. # noqa: E501
The version of the OpenAPI document: 1.1
The version of the OpenAPI document: 1.1.1
Generated by: https://openapi-generator.tech
"""

Expand All @@ -18,7 +18,7 @@
import six

from pyevr.openapi_client.api_client import ApiClient
from pyevr.openapi_client.exceptions import (
from pyevr.openapi_client.exceptions import ( # noqa: F401
ApiTypeError,
ApiValueError
)
Expand Down Expand Up @@ -90,11 +90,18 @@ def measurement_units_list_with_http_info(self, **kwargs): # noqa: E501

local_var_params = locals()

all_params = ['page', 'evr_language'] # noqa: E501
all_params.append('async_req')
all_params.append('_return_http_data_only')
all_params.append('_preload_content')
all_params.append('_request_timeout')
all_params = [
'page',
'evr_language'
]
all_params.extend(
[
'async_req',
'_return_http_data_only',
'_preload_content',
'_request_timeout'
]
)

for key, val in six.iteritems(local_var_params['kwargs']):
if key not in all_params:
Expand Down
40 changes: 28 additions & 12 deletions pyevr/openapi_client/api/measurements_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
OpenAPI Generator'i jaoks kohandatud EVR API kirjeldus. Kasuta seda juhul, kui spetsifikatsioonile vastava EVR API kirjeldusega ei õnnestu klienti genereerida. # noqa: E501
The version of the OpenAPI document: 1.1
The version of the OpenAPI document: 1.1.1
Generated by: https://openapi-generator.tech
"""

Expand All @@ -18,7 +18,7 @@
import six

from pyevr.openapi_client.api_client import ApiClient
from pyevr.openapi_client.exceptions import (
from pyevr.openapi_client.exceptions import ( # noqa: F401
ApiTypeError,
ApiValueError
)
Expand Down Expand Up @@ -92,11 +92,19 @@ def measurements_get_with_http_info(self, number, **kwargs): # noqa: E501

local_var_params = locals()

all_params = ['number', 'page', 'evr_language'] # noqa: E501
all_params.append('async_req')
all_params.append('_return_http_data_only')
all_params.append('_preload_content')
all_params.append('_request_timeout')
all_params = [
'number',
'page',
'evr_language'
]
all_params.extend(
[
'async_req',
'_return_http_data_only',
'_preload_content',
'_request_timeout'
]
)

for key, val in six.iteritems(local_var_params['kwargs']):
if key not in all_params:
Expand Down Expand Up @@ -212,11 +220,19 @@ def measurements_post_with_http_info(self, number, add_measurement_act_request,

local_var_params = locals()

all_params = ['number', 'add_measurement_act_request', 'evr_language'] # noqa: E501
all_params.append('async_req')
all_params.append('_return_http_data_only')
all_params.append('_preload_content')
all_params.append('_request_timeout')
all_params = [
'number',
'add_measurement_act_request',
'evr_language'
]
all_params.extend(
[
'async_req',
'_return_http_data_only',
'_preload_content',
'_request_timeout'
]
)

for key, val in six.iteritems(local_var_params['kwargs']):
if key not in all_params:
Expand Down

0 comments on commit 63b294c

Please sign in to comment.