Skip to content

Commit

Permalink
Merge branch 'master' into geospatial-aggregate-output
Browse files Browse the repository at this point in the history
  • Loading branch information
tuanng-cognite committed Sep 27, 2022
2 parents f9af48e + 98f5033 commit 4d14c76
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 30 deletions.
1 change: 1 addition & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ exclude_lines =
pragma: no cover
raise AssertionError
raise NotImplementedError
if TYPE_CHECKING:
omit =
cognite/client/_auxiliary/*
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ transformations/ @cognitedata/starbase @cognitedata/data-integration
test_transformations/ @cognitedata/starbase @cognitedata/data-integration
CHANGELOG.md @cognitedata/starbase @cognitedata/geospatial @cognitedata/data-integration
_version.py @cognitedata/starbase @cognitedata/geospatial @cognitedata/data-integration
pyproject.toml @cognitedata/starbase @cognitedata/geospatial @cognitedata/data-integration
pyproject.toml @cognitedata/starbase @cognitedata/geospatial @cognitedata/data-integration
10 changes: 1 addition & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,6 @@ jobs:
- name: Test core
env:
LOGIN_FLOW: client_credentials
COGNITE_CLIENT_SECRET: ${{ secrets.COGNITE_CLIENT_SECRET }}
COGNITE_TOKEN_URL: https://login.microsoftonline.com/dff7763f-e2f5-4ffd-9b8a-4ba4bafba5ea/oauth2/v2.0/token
COGNITE_TOKEN_SCOPES: https://greenfield.cognitedata.com/.default
COGNITE_CLIENT_ID: 14fd282e-f77a-457d-add5-928ec2bcbf04
COGNITE_PROJECT: python-sdk-test
COGNITE_BASE_URL: https://greenfield.cognitedata.com
COGNITE_CLIENT_NAME: python-sdk-integration-tests
CI: 1
run: pytest tests/tests_unit -n8 --dist loadscope --maxfail 10 -m 'not dsl' --test-deps-only-core

Expand Down Expand Up @@ -93,7 +85,7 @@ jobs:
COGNITE_CLIENT_NAME: python-sdk-integration-tests
CI: 1
run: |
pytest tests --cov --cov-report xml:coverage.xml -n8 --dist loadscope --reruns 2
pytest tests --durations=10 --cov --cov-report xml:coverage.xml -n8 --dist loadscope --reruns 2
- uses: codecov/codecov-action@v3
with:
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@ jobs:
- name: Test core
env:
LOGIN_FLOW: client_credentials
COGNITE_CLIENT_SECRET: ${{ secrets.COGNITE_CLIENT_SECRET }}
COGNITE_TOKEN_URL: https://login.microsoftonline.com/dff7763f-e2f5-4ffd-9b8a-4ba4bafba5ea/oauth2/v2.0/token
COGNITE_TOKEN_SCOPES: https://greenfield.cognitedata.com/.default
COGNITE_CLIENT_ID: 14fd282e-f77a-457d-add5-928ec2bcbf04
COGNITE_PROJECT: python-sdk-test
COGNITE_BASE_URL: https://greenfield.cognitedata.com
COGNITE_CLIENT_NAME: python-sdk-integration-tests
CI: 1
run: pytest tests/tests_unit -n8 --dist loadscope --maxfail 10 -m 'not dsl' --test-deps-only-core

Expand Down
24 changes: 12 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Changes are grouped as follows

## [4.5.3] - 2022-09-15
### Fixed
- Fixes the OS specific issue where the `requirements.txt`-validation failed
- Fixes the OS specific issue where the `requirements.txt`-validation failed
with `Permission Denied` on Windows.

## [4.5.2] - 2022-09-09
Expand Down Expand Up @@ -81,7 +81,7 @@ It will also cache the token between runs.

### Added
- Added Optional dependency called functions. Usage: `pip install cognite-sdk[functions]`

## [4.1.0] - 2022-08-18
### Added
- ensure_parent parameter to client.raw.insert_dataframe method
Expand All @@ -92,18 +92,18 @@ It will also cache the token between runs.

## [4.0.0] - 2022-08-15
### Changed
- Client configuration no longer respects any environment variables. There are other libraries better
- Client configuration no longer respects any environment variables. There are other libraries better
suited for loading configuration from the environment (such as builtin `os` or `pydantic`). There have also
been several reports of ennvar name clash issues in tools built on top the SDK. We therefore
consider this something that should be handled by the application consuming the SDK. All configuration of
`cognite.client.CogniteClient` now happens using a `cognite.client.ClientConfig` object. Global configuration such as
`max_connection_pool_size` and other options which apply to all client instances are now configured through
the `cognite.client.global_config` object which is an instance of `cognite.client.GlobalConfig`. Examples
been several reports of ennvar name clash issues in tools built on top the SDK. We therefore
consider this something that should be handled by the application consuming the SDK. All configuration of
`cognite.client.CogniteClient` now happens using a `cognite.client.ClientConfig` object. Global configuration such as
`max_connection_pool_size` and other options which apply to all client instances are now configured through
the `cognite.client.global_config` object which is an instance of `cognite.client.GlobalConfig`. Examples
have been added to the docs.
- Auth has been reworked. The client configuration no longer accepts the `api_key` and `token_...` arguments.
It accepts only a single `credentials` argument which must be a `CredentialProvider` object. A few
implementations have been provided (`APIKey`, `Token`, `OAuthClientCredentials`). Example usage has
been added to the docs. More credential provider implementations will be added in the future to accommodate
- Auth has been reworked. The client configuration no longer accepts the `api_key` and `token_...` arguments.
It accepts only a single `credentials` argument which must be a `CredentialProvider` object. A few
implementations have been provided (`APIKey`, `Token`, `OAuthClientCredentials`). Example usage has
been added to the docs. More credential provider implementations will be added in the future to accommodate
other OAuth flows.

### Fixed
Expand Down
1 change: 1 addition & 0 deletions mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ follow_imports = normal
namespace_packages = true
explicit_package_bases = true
show_error_codes = true
plugins = numpy.typing.mypy_plugin

[mypy-msal.*]
ignore_missing_imports = true
Expand Down

0 comments on commit 4d14c76

Please sign in to comment.