Skip to content

Commit 1cad2e7

Browse files
committed
Merge branch 'update-package-metadata' into 'master'
Apply updates from package template See merge request Sensirion/Python/python-i2c-driver!15
2 parents f1016d0 + a6e0e9c commit 1cad2e7

22 files changed

+688
-775
lines changed

.editorconfig

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
indent_style = space
8+
trim_trailing_whitespace = true
9+
10+
[*.bat]
11+
end_of_line = crlf
12+
13+
[*.hex]
14+
end_of_line = crlf

.gitattributes

100755100644
File mode changed.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.idea/
2+
.vscode/
23
.eggs/
34
build/
45
dist/

.gitlab-ci.yml

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,49 @@
1-
include: https://gitlab/Sensirion/Python/ci-config-python/raw/master/gitlab-ci-template-v1.yml
1+
include: https://gitlab.sensirion.lokal/Sensirion/Python/ci-config-python/raw/master/gitlab-ci-template-v2.yml
22

33
check_rst_syntax:
4-
extends: .check_rst_syntax_v1
5-
script:
6-
- rst-lint *.rst
4+
extends: .check_rst_syntax_v2
5+
6+
check_editorconfig:
7+
extends: .check_editorconfig_v2
8+
9+
10+
py2p7_linux_build:
11+
extends: .py2p7_linux_build_v2
12+
13+
py3p5_linux_build:
14+
extends: .py3p5_linux_build_v2
715

16+
py3p6_linux_build:
17+
extends: .py3p6_linux_build_v2
818

9-
py2p7_linux_build_v1:
10-
extends: .py2p7_linux_build_v1
19+
py3p8_linux_build:
20+
extends: .py3p8_linux_build_v2
1121

12-
py3p5_linux_build_v1:
13-
extends: .py3p5_linux_build_v1
1422

23+
py2p7_32bit_win_build:
24+
extends: .py2p7_32bit_win_docker_build_v2
1525

16-
py2p7_32bit_win_build_v1:
17-
extends: .py2p7_32bit_win_docker_build_v1
26+
py3p5_64bit_win_build:
27+
extends: .py3p5_64bit_win_docker_build_v2
1828

19-
py3p5_64bit_win_build_v1:
20-
extends: .py3p5_64bit_win_docker_build_v1
29+
py3p8_64bit_win_build:
30+
extends: .py3p8_64bit_win_docker_build_v2
2131

2232

2333
build_docs:
24-
extends: .build_docs_v1
34+
extends: .build_docs_v2
2535
script:
26-
- apt-get update && apt-get install -y graphviz
2736
- python setup.py install
2837
- pip install -r docs/requirements.txt
2938
- ./ci/set_git_config.sh
3039
- sphinx-versioning build -r "$CI_COMMIT_REF_NAME" -w "$CI_COMMIT_REF_NAME" docs docs/_build/html
31-
artifacts:
32-
paths: [docs/_build]
33-
expire_in: 1 week
34-
when: always
3540

3641

37-
deploy_staging_v1:
38-
extends: .deploy_staging_v1
42+
deploy_staging:
43+
extends: .deploy_staging_v2
3944

40-
deploy_stable_v1:
41-
extends: .deploy_stable_v1
45+
deploy_stable:
46+
extends: .deploy_stable_v2
4247
environment:
4348
name: pypi.org
4449
url: https://pypi.org/project/sensirion-i2c-driver/
@@ -54,11 +59,10 @@ deploy_stable_v1:
5459
deploy_docs:
5560
stage: deploy
5661
tags: [linux, docker]
57-
image: registry.gitlab.sensirion.lokal/sensirion/docker/docker-python:3.6-18.04-1.1.0
62+
image: registry.gitlab.sensirion.lokal/sensirion/docker/docker-python:3.6-18.04-2.7.0
5863
dependencies: []
5964
only: [master, tags]
6065
script:
61-
- apt-get update && apt-get install -y graphviz
6266
- python setup.py install
6367
- pip install -r docs/requirements.txt
6468
- ./ci/set_git_config.sh

CHANGELOG.rst

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
CHANGELOG
2-
---------
3-
4-
1.0.0
5-
:::::
6-
- First public release
7-
- Add support for post processing time of commands
8-
- Add property ``is_multi_channel`` to ``I2cConnection``
9-
- Make API of ``SensirionWordI2cCommand`` byte-oriented
10-
- Rename class ``SensirionWordI2cCommand`` to ``SensirionI2cCommand``
11-
- Remove methods ``read()`` and ``write()`` from ``I2cConnection``
12-
- Remove asynchronous mode (including the ``read()`` method) from ``I2cDevice``
13-
- Log transceived raw data with ``log.debug()``
14-
- Various documentation improvements
15-
16-
0.1.0
17-
:::::
18-
- Initial release
1+
CHANGELOG
2+
---------
3+
4+
1.0.0
5+
:::::
6+
- First public release
7+
- Add support for post processing time of commands
8+
- Add property ``is_multi_channel`` to ``I2cConnection``
9+
- Make API of ``SensirionWordI2cCommand`` byte-oriented
10+
- Rename class ``SensirionWordI2cCommand`` to ``SensirionI2cCommand``
11+
- Remove methods ``read()`` and ``write()`` from ``I2cConnection``
12+
- Remove asynchronous mode (including the ``read()`` method) from ``I2cDevice``
13+
- Log transceived raw data with ``log.debug()``
14+
- Various documentation improvements
15+
16+
0.1.0
17+
:::::
18+
- Initial release

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ pip install -e .[test] # Install requirements
2727
flake8 # Run style check
2828
```
2929

30+
In addition, we check the formatting of files with
31+
[`editorconfig-checker`](https://editorconfig-checker.github.io/):
32+
33+
```bash
34+
pip install editorconfig-checker==2.0.3 # Install requirements
35+
editorconfig-checker # Run check
36+
```
37+
3038
### Run tests
3139

3240
Unit tests can be run with [`pytest`](https://pytest.org/):

ci/set_git_config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ echo "$SSH_DEPLOY_KEY" > ~/.ssh/id_rsa
99
chmod 400 ~/.ssh/id_rsa
1010

1111
# change remote URL to SSH to allow pushing with SSH
12-
git remote set-url --push origin "git@gitlab:${CI_PROJECT_PATH}.git"
12+
git remote set-url --push origin "git@${CI_SERVER_HOST}:${CI_PROJECT_PATH}.git"
1313

1414
# set git author
1515
git config --global user.name "GitLab-CI"

docs/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
_build/
1+
/_build/

docs/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Minimal makefile for Sphinx documentation
22
#
33

4-
# You can set these variables from the command line.
5-
SPHINXOPTS =
6-
SPHINXBUILD = sphinx-build
7-
SPHINXPROJ = sensirion-i2c-driver
4+
# You can set these variables from the command line, and also
5+
# from the environment for the first two.
6+
SPHINXOPTS ?=
7+
SPHINXBUILD ?= sphinx-build
88
SOURCEDIR = .
99
BUILDDIR = _build
1010

0 commit comments

Comments
 (0)