Skip to content

Commit

Permalink
Merge pull request #57 from kurtmckee/updates
Browse files Browse the repository at this point in the history
Updates
  • Loading branch information
kurtmckee authored Oct 1, 2024
2 parents ffc7d13 + dc129f5 commit dfdf8bb
Show file tree
Hide file tree
Showing 14 changed files with 55 additions and 523 deletions.
24 changes: 11 additions & 13 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "🔬 Test"
name: "🧪 Test"

on:
pull_request:
Expand Down Expand Up @@ -27,22 +27,20 @@ jobs:
include:
# These values will be applied to all runners listed above.
- cpythons:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
tox:
post-environments:
- "coverage-report-ci"
- "mypy"
cache:
paths:
- ".mypy_cache/"
hash-files:
- "pyproject.toml"
- "requirements/*/*.txt"
- "3.13"
tox-post-environments:
- "coverage-report-ci"
- "mypy"
cache-paths:
- ".mypy_cache/"
cache-key-hash-files:
- "pyproject.toml"
- "requirements/*/*.txt"

uses: "kurtmckee/github-workflows/.github/workflows/tox.yaml@73024397dba10c866931a1d26cc2a0e7d223472f" # v0.2
uses: "kurtmckee/github-workflows/.github/workflows/tox.yaml@420931a88d3f09ca8dbce4778d145ed610c231e0" # v0.4
with:
config: "${{ toJSON(matrix) }}"
171 changes: 4 additions & 167 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,168 +1,5 @@
# Source: https://github.com/github/gitignore/blob/main/Python.gitignore
# Uncommented or changed lines:
#
# * /poetry.lock
# * .idea/
#
# ----------------------------------------------------------------------

# Byte-compiled / optimized / DLL files
/dist/
/.tox/
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
/poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
.idea/
poetry.lock
.coverage*
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ repos:
- id: "trailing-whitespace"

- repo: "https://github.com/editorconfig-checker/editorconfig-checker.python"
rev: "2.7.3"
rev: "3.0.3"
hooks:
- id: "editorconfig-checker"
# The README contains sample YAML code that uses 2-space indentation.
Expand All @@ -34,12 +34,12 @@ repos:
rev: "v3.17.0"
hooks:
- id: "pyupgrade"
name: "Enforce Python 3.8+ idioms"
name: "Enforce Python 3.9+ idioms"
args:
- "--py38-plus"
- "--py39-plus"

- repo: "https://github.com/psf/black-pre-commit-mirror"
rev: "24.4.2"
rev: "24.8.0"
hooks:
- id: "black"

Expand All @@ -49,14 +49,14 @@ repos:
- id: "isort"

- repo: "https://github.com/pycqa/flake8"
rev: "7.1.0"
rev: "7.1.1"
hooks:
- id: "flake8"
additional_dependencies:
- "flake8-bugbear==24.4.26"
- "flake8-bugbear==24.8.19"

- repo: "https://github.com/python-jsonschema/check-jsonschema"
rev: "0.29.1"
rev: "0.29.3"
hooks:
- id: "check-dependabot"
- id: "check-github-workflows"
Expand Down
5 changes: 5 additions & 0 deletions changelog.d/20240812_105419_kurtmckee_update.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Python support
--------------

- Drop Python 3.8 support.
- Add Python 3.13 support.
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository = "https://github.com/kurtmckee/dotbot-firefox"
keywords = ["dotbot", "dotbot-plugin", "firefox", "dotfiles"]

[tool.poetry.dependencies]
python = ">=3.8"
python = ">=3.9"
dotbot = ">=1.20.1"

[build-system]
Expand Down Expand Up @@ -77,4 +77,6 @@ categories = [
addopts = "--color=yes"
filterwarnings = [
"error",
# pyfakefs 5.6.0 on Python 3.13
"ignore:unclosed file:ResourceWarning:pyfakefs"
]
86 changes: 0 additions & 86 deletions requirements/mypy/poetry.lock

This file was deleted.

2 changes: 2 additions & 0 deletions requirements/mypy/poetry.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[warnings]
export = false
2 changes: 1 addition & 1 deletion requirements/mypy/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
package-mode = false

[tool.poetry.dependencies]
python = ">=3.8"
python = ">=3.9"
mypy = "*"
8 changes: 4 additions & 4 deletions requirements/mypy/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mypy-extensions==1.0.0 ; python_version >= "3.8"
mypy==1.11.0 ; python_version >= "3.8"
tomli==2.0.1 ; python_version < "3.11" and python_version >= "3.8"
typing-extensions==4.12.2 ; python_version >= "3.8"
mypy-extensions==1.0.0 ; python_version >= "3.9"
mypy==1.11.2 ; python_version >= "3.9"
tomli==2.0.1 ; python_version < "3.11" and python_version >= "3.9"
typing-extensions==4.12.2 ; python_version >= "3.9"
Loading

0 comments on commit dfdf8bb

Please sign in to comment.