Skip to content

Commit

Permalink
Merge branch 'master' into report_pr_changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dachengx authored Nov 21, 2023
2 parents 38b57e8 + abb1645 commit c49f880
Show file tree
Hide file tree
Showing 201 changed files with 14,817 additions and 12,133 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.1.3
current_version = 2.1.5
files = setup.py straxen/__init__.py
commit = True
tag = True
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
1c0e8695239194d91f8ad2fcdd23d5f0c0029419
c685863cac757648a883848352869b69833f6dcb
61d47e2bb318e8c40f89a7dd41fe45420a72dcbc
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
# Isolate binary files in case the auto-detection algorithm fails and
# marks them as text files (which could brick them).
*.{png,jpg,jpeg,gif,webp,woff,woff2} binary

38 changes: 0 additions & 38 deletions .github/scripts/pre_pyflakes.sh

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/code_style.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/pypi_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
steps:
# Setup steps
- name: Setup python
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: '3.8'

- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install dependencies
run: pip install wheel
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ jobs:
steps:
# Setup and installation
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup python
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -59,7 +59,7 @@ jobs:
pip install -r extra_requirements/requirements-tests.txt
- name: Start MongoDB
uses: supercharge/mongodb-github-action@1.9.0
uses: supercharge/mongodb-github-action@1.10.0
with:
mongodb-version: 4.4.1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
python-version: [3.8]
steps:
- name: Setup python
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: ${{ matrix.python-version }}
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: pre-install requirements
run: pip install -r requirements.txt
- name: Install straxen
Expand Down
41 changes: 41 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files

- repo: https://github.com/psf/black
rev: 23.11.0
hooks:
- id: black
args: [--safe, --line-length=100, --preview]
- id: black-jupyter
args: [--safe, --line-length=100, --preview]
language_version: python3.9

- repo: https://github.com/pycqa/docformatter
rev: v1.7.5
hooks:
- id: docformatter

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.7.0
hooks:
- id: mypy
additional_dependencies: [
types-PyYAML, types-tqdm, types-pytz,
types-requests, types-setuptools,
]

- repo: https://github.com/pycqa/flake8
rev: 6.1.0
hooks:
- id: flake8

ci:
autoupdate_schedule: weekly
Loading

0 comments on commit c49f880

Please sign in to comment.