Skip to content

Commit

Permalink
Fix all components selection. Update deps (#19)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinbowen777 authored Dec 30, 2024
1 parent ffb4aa2 commit 62e8b96
Show file tree
Hide file tree
Showing 7 changed files with 926 additions and 1,961 deletions.
29 changes: 4 additions & 25 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
exclude: 'docs|.git'
exclude: 'htmlcov|docs|.git'
fail_fast: true

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
# add supported hooks https://pre-commit.com/hooks.html
- id: check-added-large-files
Expand All @@ -15,6 +15,7 @@ repos:
- id: check-json
- id: check-merge-conflict
- id: check-toml
exclude: poetry\.lock
- id: check-yaml
- id: debug-statements
# - id: detect-aws-credentials
Expand All @@ -27,36 +28,14 @@ repos:
files: (^|/)a/.+\.(py|html|sh|css|js)$

- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.4.8
rev: v0.8.4
hooks:
# Run the linter
- id: ruff
args: [ --fix, --exit-non-zero-on-fix ]
# Run the formatter
- id: ruff-format

- repo: local
hooks:
- id: black
name: black
entry: poetry run black
language: system
types: [python]
exclude: ^.*\b(migrations)\b.*$
# See bug: https://github.com/psf/black/issues/2964
# If possible, run rev: 22.3.0 to obviate the need for pinning click
# additional_dependencies: ["click==8.0.4"]
- id: flake8
name: flake8
entry: poetry run flake8
language: system
types: [python]
# - id: isort
# name: isort
# entry: poetry run isort
# language: system
# types: [python]

- repo: https://github.com/python-poetry/poetry
rev: 1.8.0
hooks:
Expand Down
9 changes: 4 additions & 5 deletions .python-version
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
3.12.3
3.11.9
3.10.14
3.9.19
3.8.19
3.13.1
3.12.8
3.11.11
3.10.16
1,696 changes: 475 additions & 1,221 deletions poetry.lock

Large diffs are not rendered by default.

24 changes: 8 additions & 16 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,17 @@ license = "GPL-2.0-only"
package-mode = false

[tool.poetry.dependencies]
python = "^3.9"
python = ">=3.10.0, <3.14.0"

[tool.poetry.group.dev.dependencies]
pre-commit = "^3.0.0"
ruff = ">=0.1.0, <=0.3.9"
nox = "2023.4.22"
pytest = "^8.0"
pytest-cov = "^4.0.0"
coverage = { version = "^7.0.0", extras = ["toml"] }
pre-commit = ">=4.0, <5.0"
ruff = ">=0.8, <1.0"
nox = "2024.10.09"
pytest = ">=8.0, <8.4"
pytest-cov = ">=6.0.0, <7.0"
coverage = { version = ">=7.0.0, <8.0.0", extras = ["toml"] }
pylint = "^3.0"
black = "^24.0.0"
flake8 = "^7.0.0"
isort = "^5.10.1"
flake8-bandit = "^4.0.0"
flake8-black = "^0.3.3"
flake8-bugbear = "^24.0"
flake8-import-order = "^0.18.1"
safety = "^3.0"
sphinx = ">= 7.0, < 7.3.0"
sphinx = ">= 8.0, <9.0"

[tool.black]
line-length = 79
Expand Down
1,120 changes: 427 additions & 693 deletions requirements-dev.txt

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions run
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ function reqs:prod {
poetry export --output requirements.txt
}

function reqs:all {
# Export production package requirements
poetry export --output requirements.txt
poetry export --with=dev --output requirements-dev.txt
}

function secret {
# Generate a random secret that can be used for your SECRET_KEY and more
python3 -c 'import secrets; print(secrets.token_urlsafe(38))'
Expand Down
3 changes: 2 additions & 1 deletion src/clone_xfce.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
def clone_xfce(component, comp_list):
"""Run 'git clone' for selected components."""
print(f"Cloning the Xfce {component} group...")
# os.chdir(Path(__file__).parent.resolve())
# Move to the directory where the script is located
os.chdir(Path(__file__).parent.resolve())

def get_path(comp_group):
# grandparent directory (../../) relative to script.
Expand Down

0 comments on commit 62e8b96

Please sign in to comment.