Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[repo-helper] Configuration Update #9

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .dependabot/config.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ updates:
directory: /
schedule:
interval: weekly
open-pull-requests-limit: 0
reviewers:
- domdfcoding
4 changes: 2 additions & 2 deletions .github/workflows/python_ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ permissions:

jobs:
tests:
name: "macos-latest / Python ${{ matrix.config.python-version }}"
runs-on: "macos-latest"
name: "macos-13 / Python ${{ matrix.config.python-version }}"
runs-on: "macos-13"
continue-on-error: ${{ matrix.config.experimental }}
env:
USING_COVERAGE: '3.8'
Expand Down
4 changes: 2 additions & 2 deletions .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 Expand Up @@ -43,7 +43,7 @@ repos:
- id: bind-requirements

- repo: https://github.com/domdfcoding/flake8-dunder-all
rev: v0.3.1
rev: v0.4.1
hooks:
- id: ensure-dunder-all
files: ^contributing/.*\.py$
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Contributing Guide

.. start short_desc
**Contributing guide for repo-helper and associated projects**
**Contributing guide for PyMassSpec and associated projects**

.. end short_desc
View online at https://contributing.repo-helper.uk
View online at https://contributing-to-pyms.readthedocs.io
2 changes: 1 addition & 1 deletion contributing/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# __init__.py
"""
Contributing guide for repo-helper and associated projects.
Contributing guide for PyMassSpec and associated projects.
"""
#
# Copyright © 2020-2021 Dominic Davis-Foster <[email protected]>
Expand Down
Binary file added doc-source/PyMassSpec_262.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions doc-source/_templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
{% extends "!base.html" %}
{% block extrahead %}
<link href="{{ pathto("_static/style.css", True) }}" rel="stylesheet" type="text/css">
<link rel=icon href=https://pymassspec.github.io/assets/PyMassSpec.ico sizes="48x48" type="image/vnd.microsoft.icon">
{% endblock %}
9 changes: 8 additions & 1 deletion doc-source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,18 @@
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)


nitpicky = True
del version
del release
html_title = "repo-helper Contributing Guide"
html_title = "PyMassSpec Contributing Guide"
html_logo = "PyMassSpec_262.png"
2 changes: 1 addition & 1 deletion doc-source/getting-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ With bash:

.. code-block:: bash

(repo-helper) $
(PyMassSpec) $


.. _GitHub: https://github.com/
Expand Down
4 changes: 4 additions & 0 deletions doc-source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ Contributing Guide
documentation
building
release-process

.. sidebar-links::
:caption: Links
:github:
18 changes: 9 additions & 9 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 All @@ -32,4 +28,8 @@ use_parentheses = true
remove_redundant_aliases = true
default_section = "THIRDPARTY"
known_third_party = []
known_first_party = "contributing"
known_first_party = [ "contributing",]

[config]
indent = " "
line_length = 115
35 changes: 16 additions & 19 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,23 @@ build-backend = "whey"
[project]
name = "contributing"
version = "2021.0.0"
description = "Contributing guide for repo-helper and associated projects"
description = "Contributing guide for PyMassSpec and associated projects"
readme = "README.rst"
keywords = []
dynamic = [ "requires-python", "classifiers", "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "Dominic Davis-Foster"
email = "[email protected]"


[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/repo-helper/contributing"
"Issue Tracker" = "https://github.com/repo-helper/contributing/issues"
"Source Code" = "https://github.com/repo-helper/contributing"
Documentation = "https://contributing.repo-helper.uk"
Homepage = "https://github.com/PyMassSpec/contributing"
"Issue Tracker" = "https://github.com/PyMassSpec/contributing/issues"
"Source Code" = "https://github.com/PyMassSpec/contributing"
Documentation = "https://contributing-to-pyms.readthedocs.io"

[tool.whey]
base-classifiers = []
Expand All @@ -34,7 +33,7 @@ license-key = "MIT"
[tool.importcheck]

[tool.sphinx-pyproject]
github_username = "repo-helper"
github_username = "PyMassSpec"
github_repository = "contributing"
author = "Dominic Davis-Foster"
project = "contributing"
Expand All @@ -54,7 +53,6 @@ extensions = [
"sphinx.ext.mathjax",
"sphinxcontrib.extras_require",
"sphinx.ext.todo",
"sphinxemoji.sphinxemoji",
"notfound.extension",
"sphinx_copybutton",
"sphinxcontrib.default_values",
Expand All @@ -64,7 +62,6 @@ extensions = [
"html_section",
"html_section",
]
sphinxemoji_style = "twemoji"
gitstamp_fmt = "%d %b %Y"
templates_path = [ "_templates",]
html_static_path = [ "_static",]
Expand Down Expand Up @@ -124,13 +121,6 @@ show_error_codes = true
[tool.snippet-fmt]
directives = [ "code-block",]

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

[tool.dependency-dash."doc-source/requirements.txt"]
order = 30
include = false

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

Expand All @@ -140,3 +130,10 @@ reformat = true
[tool.snippet-fmt.languages.ini]

[tool.snippet-fmt.languages.json]

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

[tool.dependency-dash."doc-source/requirements.txt"]
order = 30
include = false
10 changes: 6 additions & 4 deletions repo_helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@ modname: 'contributing'
copyright_years: '2020-2021'
author: 'Dominic Davis-Foster'
email: '[email protected]'
username: 'repo-helper'
username: 'PyMassSpec'
assignee: 'domdfcoding'
version: '2021.0.0'
license: 'MIT'
short_desc: 'Contributing guide for repo-helper and associated projects'
short_desc: 'Contributing guide for PyMassSpec and associated projects'

use_whey: True
docs_fail_on_warning: true
sphinx_html_theme: furo
enable_tests: false
enable_conda: false
on_pypi: false
docs_url: https://contributing.repo-helper.uk
docs_url: https://contributing-to-pyms.readthedocs.io
preserve_custom_theme: true

python_versions:
- '3.8'
Expand All @@ -25,7 +26,8 @@ sphinx_conf_epilogue:
- nitpicky = True
- del version
- del release
- html_title = "repo-helper Contributing Guide"
- html_title = "PyMassSpec Contributing Guide"
- html_logo = "PyMassSpec_262.png"

extra_sphinx_extensions:
- html_section
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ setenv =
PYTHONDEVMODE=1
PIP_DISABLE_PIP_VERSION_CHECK=1
PIP_PREFER_BINARY=1
UNSAFE_PYO3_SKIP_VERSION_CHECK=1
skip_install = True
changedir = {toxinidir}
deps =
build[virtualenv]>=0.3.1
check-wheel-contents>=0.1.0
twine>=3.2.0; python_version < "3.13"
twine@git+https://github.com/pypa/twine; python_version >= "3.13"
twine>=3.2.0
cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
commands =
python -m build --sdist --wheel "{toxinidir}"
Expand All @@ -87,7 +87,7 @@ deps =
flake8-github-actions>=0.1.0
flake8-noqa>=1.1.0,<=1.2.2
flake8-pyi>=20.10.0,<=22.8.0
flake8-pytest-style>=1.3.0
flake8-pytest-style>=1.3.0,<2
flake8-quotes>=3.3.0
flake8-slots>=0.1.0
flake8-sphinx-links>=0.0.4
Expand Down
Loading