Skip to content

Commit 392e933

Browse files
committed
clean up dependency handling
1 parent 10decd2 commit 392e933

File tree

6 files changed

+46
-13
lines changed

6 files changed

+46
-13
lines changed

.github/workflows/check-release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ on:
33
push:
44
branches: ["main"]
55
pull_request:
6-
branches: ["*"]
76

87
concurrency:
98
group: check-release-${{ github.ref }}

.github/workflows/downstream.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ name: Test downstream projects
22

33
on:
44
push:
5-
branches: "*"
5+
branches: ["main"]
66
pull_request:
7-
branches: "*"
87

98
concurrency:
109
group: downstream-${{ github.ref }}

.github/workflows/main.yml

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: CI
22

33
on:
44
push:
5+
branches: ["main"]
56
pull_request:
67

78
concurrency:
@@ -51,7 +52,7 @@ jobs:
5152
fail-fast: false
5253
matrix:
5354
os: [ubuntu-latest, macos-latest, windows-latest]
54-
python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
55+
python-version: [3.7, 3.8, 3.9, "3.10"]
5556

5657
env:
5758
OS: ${{ matrix.os }}
@@ -65,7 +66,7 @@ jobs:
6566

6667
- name: Install dependencies
6768
run: |
68-
pip install --upgrade --upgrade-strategy eager --pre -e .[test]
69+
pip install -e .[test]
6970
pip freeze
7071
7172
- name: Check types
@@ -82,3 +83,36 @@ jobs:
8283
8384
- name: Code coverage
8485
run: codecov
86+
87+
test_miniumum_verisons:
88+
name: Test Minimum Versions
89+
runs-on: ubuntu-latest
90+
steps:
91+
- uses: actions/checkout@v2
92+
- name: Base Setup
93+
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
94+
with:
95+
python_version: "3.7"
96+
- name: Install miniumum versions
97+
uses: jupyterlab/maintainer-tools/.github/actions/install-minimums@v1
98+
- name: Run the unit tests
99+
run: pytest -vv jupyter_client
100+
101+
test_prereleases:
102+
name: Test Prereleases
103+
runs-on: ubuntu-latest
104+
steps:
105+
- name: Checkout
106+
uses: actions/checkout@v2
107+
- name: Base Setup
108+
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
109+
- name: Install the Python dependencies
110+
run: |
111+
pip install --upgrade --upgrade-strategy eager --pre -e ".[test]"
112+
- name: List installed packages
113+
run: |
114+
pip freeze
115+
pip check
116+
- name: Run the tests
117+
run: |
118+
pytest -vv jupyter_client

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
repos:
22
- repo: https://github.com/asottile/reorder_python_imports
3-
rev: v1.9.0
3+
rev: v2.7.1
44
hooks:
55
- id: reorder-python-imports
66
- repo: https://github.com/psf/black
7-
rev: 20.8b1
7+
rev: 22.1.0
88
hooks:
99
- id: black
1010
args: ["--line-length", "100"]
1111
- repo: https://github.com/pre-commit/mirrors-prettier
12-
rev: v2.2.1
12+
rev: v2.5.1
1313
hooks:
1414
- id: prettier
1515
- repo: https://gitlab.com/pycqa/flake8
16-
rev: "3.8.4"
16+
rev: "3.9.2"
1717
hooks:
1818
- id: flake8
1919
- repo: https://github.com/pre-commit/pre-commit-hooks
20-
rev: v3.4.0
20+
rev: v4.1.0
2121
hooks:
2222
- id: end-of-file-fixer
2323
- id: check-case-conflict

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
line-length = 100
33
skip-string-normalization = true
44
target_version = [
5-
"py36",
65
"py37",
76
"py38",
7+
"py39",
8+
"py310",
89
]
910

1011
[tool.jupyter-releaser]

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@
4848
'Operating System :: OS Independent',
4949
'Programming Language :: Python',
5050
'Programming Language :: Python :: 3',
51-
'Programming Language :: Python :: 3.6',
5251
'Programming Language :: Python :: 3.7',
5352
'Programming Language :: Python :: 3.8',
5453
'Programming Language :: Python :: 3.9',
54+
'Programming Language :: Python :: 3.10',
5555
],
56-
python_requires='>=3.6.1',
56+
python_requires='>=3.7',
5757
install_requires=requirements,
5858
extras_require={
5959
'test': requirements_test,

0 commit comments

Comments
 (0)