Skip to content

Commit

Permalink
Merge pull request #142 from roskakori/dependabot/pip/wheel-0.38.1
Browse files Browse the repository at this point in the history
Bump wheel from 0.37.1 to 0.38.1
  • Loading branch information
roskakori committed Dec 29, 2022
2 parents a1b5bd4 + 4f39bd8 commit 338ec62
Show file tree
Hide file tree
Showing 12 changed files with 527 additions and 619 deletions.
37 changes: 24 additions & 13 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
env:
MAIN_PYTHON_VERSION: 3.8
MAIN_PYTHON_VERSION: "3.10"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install Poetry
Expand All @@ -24,7 +24,7 @@ jobs:
virtualenvs-in-project: true
- name: Load cached venv
id: cached-poetry-dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: .venv
key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
Expand All @@ -42,19 +42,30 @@ jobs:
if: ${{ matrix.python-version }} == $MAIN_PYTHON_VERSION
env:
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
poetry run coveralls
check-style:
runs-on: ubuntu-latest
# Disable pre-commit check on main and production to prevent
# pull request merges to fail with "don't commit to branch".
if: github.ref != 'refs/heads/main'
steps:
- uses: actions/checkout@v3
- name: Install pre-commit
run: |
sudo apt-get install python3
python -m pip install --upgrade pip
pip install pre-commit
- name: Load cached pre-commit
id: cached-pre-commit
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.cache/pre-commit
key: pre-commit-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('.pre-commit-config.yaml') }}
- name: Install pre-commit
key: pre-commit-${{ runner.os }}-${{ hashFiles('.pre-commit-config.yaml') }}
- name: Install pre-commit hooks
if: steps.cached-pre-commit.outputs.cache-hit != 'true'
run: |
poetry run pre-commit install --install-hooks
run: pre-commit install --install-hooks
- name: Check coding style
if: ${{ matrix.python-version }} == $MAIN_PYTHON_VERSION
run: |
poetry run pre-commit run --all-files
run: pre-commit run --all-files
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ exclude: "^.idea"

repos:
- repo: https://github.com/pre-commit/mirrors-isort
rev: v5.9.3
rev: v5.10.1
hooks:
- id: isort

- repo: https://github.com/ambv/black
rev: 21.12b0
rev: 22.12.0
hooks:
- id: black

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.5.1
rev: v3.0.0-alpha.4
hooks:
- id: prettier

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
rev: v4.4.0
hooks:
- id: fix-byte-order-marker
- id: trailing-whitespace
Expand All @@ -31,8 +31,8 @@ repos:
- id: end-of-file-fixer
- id: mixed-line-ending

- repo: https://gitlab.com/pycqa/flake8
rev: 3.9.2
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
hooks:
- id: flake8
additional_dependencies: ["pep8-naming==0.12.1"]
additional_dependencies: ["pep8-naming==0.13.3"]
3 changes: 1 addition & 2 deletions cutplace/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import tokenize

from cutplace import _compat, _tools, errors, ranges

from cutplace._tools import generated_tokens

#: Value for property ``line_delimiter`` to indicate any possible delimiter.
Expand Down Expand Up @@ -81,7 +80,7 @@
_VALID_DECIMAL_SEPARATORS = [".", ","]
_VALID_THOUSANDS_SEPARATORS = [",", ".", ""]
_VALID_FORMATS = [FORMAT_DELIMITED, FORMAT_EXCEL, FORMAT_FIXED, FORMAT_ODS]
_VALID_QUOTING = ['all', 'minimal', 'nonnumeric', 'none']
_VALID_QUOTING = ["all", "minimal", "nonnumeric", "none"]

READABLE_TO_CSV_QUOTING_FORMAT = {
"all": csv.QUOTE_ALL,
Expand Down
4 changes: 2 additions & 2 deletions cutplace/ranges.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#: '...' as single character.
ELLIPSIS = "\u2026"

MAX_INTEGER = 2 ** 31 - 1
MIN_INTEGER = -(2 ** 31)
MAX_INTEGER = 2**31 - 1
MIN_INTEGER = -(2**31)

DEFAULT_INTEGER_RANGE_TEXT = "%d...%d" % (MIN_INTEGER, MAX_INTEGER)

Expand Down
8 changes: 4 additions & 4 deletions cutplace/sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
from cutplace import rowio

# TODO: Move to module ``ranges``.
MAX_TINYINT = 2 ** 8 - 1 # NOTE: Tinyint really is unsigned.
MAX_SMALLINT = 2 ** 15 - 1
MAX_INTEGER = 2 ** 31 - 1
MAX_BIGINT = 2 ** 63 - 1
MAX_TINYINT = 2**8 - 1 # NOTE: Tinyint really is unsigned.
MAX_SMALLINT = 2**15 - 1
MAX_INTEGER = 2**31 - 1
MAX_BIGINT = 2**63 - 1

#: SQL dialect name: ANSI SQL
ANSI = "ANSI"
Expand Down
6 changes: 6 additions & 0 deletions docs/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ Revision history

This chapter describes improvements compared to earlier versions of cutplace.

Version 0.9.1, 2022-12-29
=========================

* Dropped support for Python 3.6.
* Updated dependencies.
* Cleaned up CI build and pre-commit hooks to work with current versions.

Version 0.9.0, 2021-12-27
=========================
Expand Down
6 changes: 3 additions & 3 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Dependencies for "Read the Docs" build.
# See <https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html>.
sphinx==4.3.2
sphinx_rtd_theme==1.0.0
readthedocs-sphinx-search==0.1.1
sphinx==5.3.0
sphinx_rtd_theme==1.1.1
readthedocs-sphinx-search==0.1.2

0 comments on commit 338ec62

Please sign in to comment.