Skip to content

Commit 79d6be4

Browse files
authored
CI, package updates, 3.10 support, 3.6 deprecation, add precommit (#329)
- poetry 1.1.7 -> 1.1.12, use new installer - Drop python 3.6 - Add python 3.10 - CI: test 3.7 and 3.10 (low and high end of supported releases) - Update myst-parser and sphinx-autodoc-typehints - Add `.pre-commit-config.yaml` - black: update 21.9b0 -> 21.12b0
2 parents 89c4d8c + c9ddca6 commit 79d6be4

File tree

7 files changed

+51
-45
lines changed

7 files changed

+51
-45
lines changed

.github/workflows/publish-docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
python-version: ["3.9"]
13+
python-version: ["3.10"]
1414
steps:
1515
- uses: actions/checkout@v1
1616
- name: Configure git
@@ -49,8 +49,8 @@ jobs:
4949

5050
- name: Install poetry
5151
run: |
52-
curl -O -sSL https://raw.githubusercontent.com/sdispater/poetry/master/install-poetry.py
53-
python install-poetry.py -y --version 1.1.7
52+
curl -O -sSL https://install.python-poetry.org/install-poetry.py
53+
python install-poetry.py -y --version 1.1.12
5454
echo "PATH=${HOME}/.poetry/bin:${PATH}" >> $GITHUB_ENV
5555
rm install-poetry.py
5656

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
python-version: ["3.9"]
12+
python-version: ["3.7", "3.10"]
1313
steps:
1414
- uses: actions/checkout@v1
1515
- name: Configure git
@@ -28,8 +28,8 @@ jobs:
2828

2929
- name: Install poetry
3030
run: |
31-
curl -O -sSL https://raw.githubusercontent.com/sdispater/poetry/master/install-poetry.py
32-
python install-poetry.py -y --version 1.1.7
31+
curl -O -sSL https://install.python-poetry.org/install-poetry.py
32+
python install-poetry.py -y --version 1.1.12
3333
echo "PATH=${HOME}/.poetry/bin:${PATH}" >> $GITHUB_ENV
3434
rm install-poetry.py
3535

.pre-commit-config.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
repos:
2+
- repo: https://github.com/ambv/black
3+
rev: 21.12b0
4+
hooks:
5+
- id: black
6+
language_version: python3.10
7+
- repo: https://github.com/pycqa/isort
8+
rev: 5.10.1
9+
hooks:
10+
- id: isort
11+
name: isort (python)
12+
- repo: https://gitlab.com/pycqa/flake8
13+
rev: 4.0.1
14+
hooks:
15+
- id: flake8

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
poetry 1.1.7
1+
poetry 1.1.12

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ See donation options at <https://git-pull.com/support.html>.
130130

131131
# More information
132132

133-
- Python support: >= 3.6, pypy
133+
- Python support: >= 3.7, pypy
134134
- VCS supported: git(1), svn(1), hg(1)
135135
- Source: <https://github.com/vcs-python/vcspull>
136136
- Docs: <https://vcspull.git-pull.com>

poetry.lock

Lines changed: 18 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ classifiers = [
1616
"Operating System :: MacOS :: MacOS X",
1717
"Programming Language :: Python",
1818
"Programming Language :: Python :: 3",
19-
"Programming Language :: Python :: 3.6",
2019
"Programming Language :: Python :: 3.7",
2120
"Programming Language :: Python :: 3.8",
2221
"Programming Language :: Python :: 3.9",
@@ -36,13 +35,14 @@ homepage = "https://vcspull.git-pull.com"
3635
"Bug Tracker" = "https://github.com/vcs-python/vcspull/issues"
3736
Documentation = "https://vcspull.git-pull.com"
3837
Repository = "https://github.com/vcs-python/vcspull"
38+
Changes = "https://github.com/vcs-python/vcspull/blob/master/CHANGES"
3939

4040
[tool.poetry.scripts]
4141
vcspull = 'vcspull:cli.cli'
4242

4343
[tool.poetry.dependencies]
44-
python = "^3.6"
45-
click = ">=7<8"
44+
python = "^3.7"
45+
click = ">=7<8.1"
4646
kaptan = "*"
4747
libvcs = "~0.10.1"
4848
colorama = ">=0.3.9"
@@ -53,8 +53,8 @@ sphinx = "*"
5353
alagitpull = "^0.1.0"
5454
sphinx-issues = "^1.2.0"
5555
sphinx-click = "*"
56-
sphinx-autodoc-typehints = "^1.12.0"
57-
myst_parser = "^0.15.0"
56+
sphinx-autodoc-typehints = "~1.14.1"
57+
myst_parser = "~0.16.1"
5858

5959
### Testing ###
6060
pytest = "*"
@@ -66,7 +66,7 @@ coverage = "*"
6666
pytest-cov = "*"
6767

6868
### Format ###
69-
black = {version="==21.12b0", python="^3.6.2"}
69+
black = "==21.12b0"
7070
isort = "*"
7171

7272
### Lint ###
@@ -78,3 +78,7 @@ test = ["pytest", "pytest-rerunfailures"]
7878
coverage = ["codecov", "coverage", "pytest-cov"]
7979
format = ["black", "isort"]
8080
lint = ["flake8"]
81+
82+
[build-system]
83+
requires = ["poetry_core>=1.0.0"]
84+
build-backend = "poetry.core.masonry.api"

0 commit comments

Comments
 (0)