Skip to content

Commit

Permalink
Merge e1e7aff into 89b778a
Browse files Browse the repository at this point in the history
  • Loading branch information
repo-helper[bot] committed Apr 24, 2024
2 parents 89b778a + e1e7aff commit a463c2b
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ci:

repos:
- repo: https://github.com/repo-helper/pyproject-parser
rev: v0.9.1
rev: v0.11.0
hooks:
- id: reformat-pyproject

Expand Down
6 changes: 6 additions & 0 deletions doc-source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,14 @@
def setup(app):
# 3rd party
from sphinx_toolbox.latex import better_header_layout
from sphinxemoji import sphinxemoji

app.connect("config-inited", lambda app, config: better_header_layout(config))
app.connect("build-finished", sphinxemoji.copy_asset_files)
app.add_js_file("https://unpkg.com/twemoji@latest/dist/twemoji.min.js")
app.add_js_file("twemoji.js")
app.add_css_file("twemoji.css")
app.add_transform(sphinxemoji.EmojiSubstitutions)


html_logo = "../logo/PyMassSpec_262.png"
16 changes: 8 additions & 8 deletions formate.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,17 @@ noqa-reformat = 60
ellipsis-reformat = 70
squish_stubs = 80

[config]
indent = "\t"
line_length = 115

[hooks.yapf]
priority = 30

[hooks.isort]
priority = 50

[hooks.yapf.kwargs]
yapf_style = ".style.yapf"

[hooks.isort]
priority = 50

[hooks.isort.kwargs]
indent = "\t\t"
indent = " "
multi_line_output = 8
import_heading_stdlib = "stdlib"
import_heading_thirdparty = "3rd party"
Expand Down Expand Up @@ -80,3 +76,7 @@ known_third_party = [
"typing_extensions",
]
known_first_party = [ "pyms",]

[config]
indent = " "
line_length = 115
23 changes: 10 additions & 13 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ dynamic = [ "dependencies",]
name = "Dominic Davis-Foster"
email = "dominic@davis-foster.co.uk"


[project.license]
file = "LICENSE"

Expand Down Expand Up @@ -100,7 +99,6 @@ extensions = [
"sphinx.ext.mathjax",
"sphinxcontrib.extras_require",
"sphinx.ext.todo",
"sphinxemoji.sphinxemoji",
"notfound.extension",
"sphinx_copybutton",
"sphinxcontrib.default_values",
Expand All @@ -113,7 +111,6 @@ extensions = [
"sphinx.ext.autosectionlabel",
"ignore_missing_xref",
]
sphinxemoji_style = "twemoji"
gitstamp_fmt = "%d %b %Y"
templates_path = [ "_templates",]
html_static_path = [ "_static",]
Expand Down Expand Up @@ -173,6 +170,16 @@ show_error_codes = true
[tool.snippet-fmt]
directives = [ "code-block",]

[tool.snippet-fmt.languages.python]
reformat = true

[tool.snippet-fmt.languages.TOML]
reformat = true

[tool.snippet-fmt.languages.ini]

[tool.snippet-fmt.languages.json]

[tool.dependency-dash."requirements.txt"]
order = 10

Expand All @@ -183,13 +190,3 @@ include = false
[tool.dependency-dash."doc-source/requirements.txt"]
order = 30
include = false

[tool.snippet-fmt.languages.python]
reformat = true

[tool.snippet-fmt.languages.TOML]
reformat = true

[tool.snippet-fmt.languages.ini]

[tool.snippet-fmt.languages.json]
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ commands =
python --version
python -m pytest --cov=pyms -r aR tests/ {posargs}

[testenv:.package]
setenv = PIP_DISABLE_PIP_VERSION_CHECK=1

[testenv:py312]
setenv = PIP_DISABLE_PIP_VERSION_CHECK=1

Expand Down

0 comments on commit a463c2b

Please sign in to comment.