Skip to content

Commit

Permalink
Merge branch 'master' into fix-Scheduler
Browse files Browse the repository at this point in the history
  • Loading branch information
rmax authored Jul 6, 2024
2 parents 6079448 + ea646cb commit 8128530
Show file tree
Hide file tree
Showing 37 changed files with 672 additions and 548 deletions.
7 changes: 5 additions & 2 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
[flake8]

max-line-length = 119
ignore = W503
ignore =
W503
P102
P103

exclude =
tests/test_spiders.py E731
docs/conf.py E265
docs/conf.py E265
10 changes: 6 additions & 4 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# This is GitHub Action for cross platform building
name: build
on:
push:
branches: [master]
pull_request:
branches: [master]

Expand All @@ -11,18 +13,18 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.11.3"]
python-version: ["3.12"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Run build
env:
env:
TOXENV: build
run: |
pip install -r requirements-tests.txt
Expand Down
20 changes: 16 additions & 4 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,41 @@
# This is GitHub Action for linting and security check
name: check
on:
push:
branches: [master]
pull_request:
branches: [master]

concurrency:
group: ${{github.workflow}}-${{ github.ref }}
cancel-in-progress: true

jobs:
checks:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: ["3.11.3"]
python-version: ["3.12"]
env: [security, flake8]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Run check
env:
env:
TOXENV: ${{ matrix.env }}
run: |
pip install -r requirements-tests.txt
tox
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pre-commit/action@v3.0.0
11 changes: 9 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# This is GitHub Action for tests
name: test
on:
push:
branches: [master]
pull_request:
branches: [master]

Expand All @@ -10,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.11.3"]
python-version: ["3.12"]

services:
redis:
Expand All @@ -24,7 +26,12 @@ jobs:
container: python:${{ matrix.python-version }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Run pytest
env:
Expand Down
2 changes: 2 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[settings]
profile = black
36 changes: 36 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
repos:
- repo: https://github.com/PyCQA/bandit
rev: 1.7.7
hooks:
- id: bandit
args: [-r, -c, .bandit.yml]
- repo: https://github.com/PyCQA/flake8
rev: 7.0.0
hooks:
- id: flake8
additional_dependencies:
- flake8-bugbear
- flake8-comprehensions
- flake8-debugger
#- flake8-docstrings
- flake8-string-format
- flake8-type-checking
- repo: https://github.com/psf/black.git
rev: 24.2.0
hooks:
- id: black
- repo: https://github.com/pycqa/isort
rev: 5.13.2
hooks:
- id: isort
- repo: https://github.com/adamchainz/blacken-docs
rev: 1.16.0
hooks:
- id: blacken-docs
additional_dependencies:
- black==24.2.0
- repo: https://github.com/asottile/pyupgrade
rev: v3.15.2
hooks:
- id: pyupgrade
args: [--py38-plus, --keep-runtime-typing]
2 changes: 1 addition & 1 deletion AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Credits
Development Lead
----------------

* Rolando Espinoza <rolando at rmax.io>
* R Max Espinoza <hey at rmax.dev>

Contributors
------------
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2022, Rolando Espinoza
Copyright (c) 2011-2024, R Max Espinoza

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
Loading

0 comments on commit 8128530

Please sign in to comment.