Skip to content

Commit 2cd4675

Browse files
RazerMRazerM
committed
Merge branch 'release/1.6.0'
2 parents bcae0a5 + 18d97a4 commit 2cd4675

File tree

107 files changed

+3226
-3274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+3226
-3274
lines changed

‎.appveyor/after_test.bat

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.appveyor/build.cmd

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎.appveyor/prepare.bat

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎.github/workflows/main.yml

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
---
2+
name: CI
3+
4+
on:
5+
push:
6+
branches: ["develop", "master"]
7+
pull_request:
8+
branches: ["develop", "master"]
9+
workflow_dispatch:
10+
11+
jobs:
12+
linux:
13+
name: "Linux (${{ matrix.python-version }})"
14+
runs-on: "ubuntu-latest"
15+
16+
services:
17+
redis:
18+
image: redis
19+
ports:
20+
- 6379:6379
21+
options: >-
22+
--health-cmd "redis-cli ping"
23+
--health-interval 10s
24+
--health-timeout 5s
25+
--health-retries 5
26+
27+
strategy:
28+
fail-fast: false
29+
matrix:
30+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
31+
32+
steps:
33+
- uses: "actions/checkout@v3"
34+
- uses: "actions/setup-python@v4"
35+
with:
36+
python-version: "${{ matrix.python-version }}"
37+
- name: "Install dependencies"
38+
run: |
39+
set -xe
40+
python -VV
41+
python -m site
42+
python -m pip install --upgrade pip setuptools wheel
43+
python -m pip install --upgrade tox tox-gh-actions
44+
45+
- name: "Run tox targets for ${{ matrix.python-version }}"
46+
run: "python -m tox -- -r aR"
47+
48+
windows:
49+
name: "Windows (${{ matrix.python-version }}, ${{ matrix.arch }})"
50+
runs-on: "windows-latest"
51+
52+
strategy:
53+
fail-fast: false
54+
matrix:
55+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
56+
arch: ["x86", "x64"]
57+
58+
env:
59+
ENABLE_LOGBOOK_NTEVENTLOG_TESTS: "1"
60+
61+
steps:
62+
- uses: "actions/checkout@v3"
63+
- uses: "actions/setup-python@v4"
64+
with:
65+
python-version: "${{ matrix.python-version }}"
66+
architecture: "${{ matrix.arch }}"
67+
68+
- run: python -VV
69+
- run: python -m site
70+
- run: python -m pip install --upgrade pip setuptools wheel
71+
- run: python -m pip install --upgrade tox tox-gh-actions
72+
73+
- name: "Run tox targets for ${{ matrix.python-version }} on ${{ matrix.arch }}"
74+
run: "python -m tox -- -r aR -k 'not redis'"
75+
76+
macos:
77+
name: "macOS (${{ matrix.python-version }})"
78+
runs-on: "macos-latest"
79+
80+
strategy:
81+
fail-fast: false
82+
matrix:
83+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
84+
85+
steps:
86+
- uses: "actions/checkout@v3"
87+
- uses: "actions/setup-python@v4"
88+
with:
89+
python-version: "${{ matrix.python-version }}"
90+
architecture: "${{ matrix.arch }}"
91+
- name: "Install dependencies"
92+
run: |
93+
set -xe
94+
python -VV
95+
python -m site
96+
python -m pip install --upgrade pip setuptools wheel
97+
python -m pip install --upgrade tox tox-gh-actions
98+
99+
- name: "Run tox targets for ${{ matrix.python-version }}"
100+
run: "python -m tox -- -r aR -k 'not redis'"
101+
102+
pre-commit:
103+
runs-on: ubuntu-latest
104+
steps:
105+
- uses: actions/checkout@v3
106+
- uses: actions/setup-python@v4
107+
- uses: pre-commit/action@v3.0.0

‎.github/workflows/pypi-publish.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# This is based on pyca/cryptography but we use cibuildwheel
2+
# https://github.com/pyca/cryptography/blob/50ae9623df9181e5d08bbca0791ae69af4d3d446/.github/workflows/pypi-publish.yml
3+
name: Publish to PyPI
4+
5+
on:
6+
workflow_dispatch:
7+
inputs:
8+
run_id:
9+
description: The run of wheel-builder to use for finding artifacts.
10+
required: true
11+
environment:
12+
description: Which PyPI environment to upload to
13+
required: true
14+
type: choice
15+
options: [testpypi, pypi]
16+
workflow_run:
17+
workflows: ["Wheel Builder"]
18+
types: [completed]
19+
20+
jobs:
21+
publish:
22+
runs-on: ubuntu-latest
23+
# We're not actually verifying that the triggering push event was for a
24+
# tag, because github doesn't expose enough information to do so.
25+
# wheel-builder.yml currently only has push events for tags.
26+
if: github.event_name == 'workflow_dispatch' || (github.event.workflow_run.event == 'push' && github.event.workflow_run.conclusion == 'success')
27+
environment: publish
28+
permissions:
29+
id-token: write
30+
steps:
31+
- name: Download artifacts
32+
uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # v2.27.0
33+
with:
34+
path: artifacts/
35+
run_id: ${{ github.event.inputs.run_id || github.event.workflow_run.id }}
36+
37+
- name: Move artifacts to dist/
38+
run: |
39+
ls -lR artifacts/
40+
mkdir dist
41+
mv artifacts/sdist/*.tar.gz dist/
42+
mv artifacts/wheels/*.whl dist/
43+
44+
- name: Publish to pypi.org
45+
uses: pypa/gh-action-pypi-publish@f8c70e705ffc13c3b4d1221169b84f12a75d6ca8 # v1.8.8
46+
if: github.event_name == 'workflow_run' || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'pypi')
47+
with:
48+
packages-dir: dist/
49+
50+
- name: Publish to test.pypi.org
51+
uses: pypa/gh-action-pypi-publish@f8c70e705ffc13c3b4d1221169b84f12a75d6ca8 # v1.8.8
52+
if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'testpypi'
53+
with:
54+
repository-url: https://test.pypi.org/legacy/
55+
packages-dir: dist/

‎.github/workflows/wheel-builder.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# This is based on pyca/cryptography but we use cibuildwheel
2+
# https://github.com/pyca/cryptography/blob/50ae9623df9181e5d08bbca0791ae69af4d3d446/.github/workflows/wheel-builder.yml
3+
name: Wheel Builder
4+
5+
permissions:
6+
contents: read
7+
on:
8+
workflow_dispatch:
9+
inputs:
10+
version:
11+
description: The Git ref to build
12+
# Do not add any non-tag push events without updating pypi-publish.yml. If
13+
# you do, it'll upload wheels to PyPI.
14+
push:
15+
tags:
16+
- "*"
17+
pull_request:
18+
paths:
19+
- .github/workflows/wheel-builder.yml
20+
- setup.py
21+
- pyproject.toml
22+
23+
jobs:
24+
sdist:
25+
name: Build sdist
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
29+
with:
30+
# The tag to build or the tag received by the tag event
31+
ref: ${{ github.event.inputs.version || github.ref }}
32+
persist-credentials: false
33+
34+
- run: python -m venv .venv
35+
- name: Install Python dependencies
36+
run: .venv/bin/pip install -U pip build
37+
- name: Make sdist
38+
run: .venv/bin/python -m build --sdist
39+
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
40+
with:
41+
name: sdist
42+
path: dist/*.tar.gz
43+
44+
build_wheels:
45+
name: Build wheels on ${{ matrix.os }}
46+
runs-on: ${{ matrix.os }}
47+
strategy:
48+
fail-fast: false
49+
matrix:
50+
os: [ubuntu-20.04, windows-2019, macos-11]
51+
52+
steps:
53+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
54+
with:
55+
# The tag to build or the tag received by the tag event
56+
ref: ${{ github.event.inputs.version || github.ref }}
57+
persist-credentials: false
58+
59+
- name: Build wheels
60+
uses: pypa/cibuildwheel@f21bb8376a051ffb6cb5604b28ccaef7b90e8ab7 # v2.14.1
61+
62+
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
63+
with:
64+
name: wheels
65+
path: ./wheelhouse/*.whl

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ target/
6060

6161
# Logbook specific / custom ignores
6262
.ropeproject
63-
logbook/_speedups.c
63+
src/cython/speedups.c
6464
env*
6565
.vagrant
6666
flycheck-*

‎.pre-commit-config.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v4.4.0
4+
hooks:
5+
- id: check-toml
6+
- id: check-yaml
7+
- id: check-added-large-files
8+
- id: check-merge-conflict
9+
- id: end-of-file-fixer
10+
- id: trailing-whitespace
11+
args: [--markdown-linebreak-ext=md]
12+
- repo: https://github.com/pre-commit/mirrors-prettier
13+
rev: v2.7.1
14+
hooks:
15+
- id: prettier
16+
exclude: docs/sheet/.*\.html$
17+
- repo: https://github.com/asottile/pyupgrade
18+
rev: v3.7.0
19+
hooks:
20+
- id: pyupgrade
21+
args: [--py37-plus]
22+
- repo: https://github.com/timothycrosley/isort
23+
rev: 5.12.0
24+
hooks:
25+
- id: isort
26+
- repo: https://github.com/psf/black
27+
rev: 23.3.0
28+
hooks:
29+
- id: black

‎.readthedocs.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version: 2
2+
3+
build:
4+
os: ubuntu-20.04
5+
tools:
6+
python: "3.11"
7+
8+
python:
9+
install:
10+
- method: pip
11+
path: .
12+
extra_requirements:
13+
- docs

0 commit comments

Comments
 (0)