Skip to content

Run Autoformatters #6335

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.

Sign up for GitHub

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

Merged
blink1073 merged 10 commits into from
Apr 1, 2022
Merged

Run Autoformatters #6335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7299b91
run autoformatters
blink1073 Apr 1, 2022
52b64a2
Update bumpversion config
blink1073 Apr 1, 2022
7fc5c0d
fix bumpversion again
blink1073 Apr 1, 2022
40c6a8b
fix versioning workflow
blink1073 Apr 1, 2022
2039cea
fix versioning workflow
blink1073 Apr 1, 2022
5a33b48
try again
blink1073 Apr 1, 2022
015b18f
fix versioning workflow
blink1073 Apr 1, 2022
8269687
fix replacement
blink1073 Apr 1, 2022
cf91ecd
check file contents
blink1073 Apr 1, 2022
36807a3
another try
blink1073 Apr 1, 2022
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
6 changes: 3 additions & 3 deletions .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[bumpversion]
current_version = 7, 0, 0, 'alpha', 2
current_version = 7, 0, 0, "alpha", 2
commit = False
tag = False
parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \'(?P<release>\S+)\'\,\ (?P<build>\d+)
parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \"(?P<release>\S+)\"\,\ (?P<build>\d+)
serialize =
{major}, {minor}, {patch}, '{release}', {build}
{major}, {minor}, {patch}, "{release}", {build}

[bumpversion:part:release]
optional_value = final
Expand Down
3 changes: 0 additions & 3 deletions .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
lint-staged.config.js
.eslintrc.js

node_modules
**/build
**/lib
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/buildutils.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@ jobs:
run: |
# TODO: improve this with a mock package?
# This step is to ensure the workflow always starts with a final version
sed -i -E "s/VersionInfo\(.*\)/VersionInfo\(9, 8, 7, 'final', 0\)/" notebook/_version.py
sed -i -E "s/current_version = .*/current_version = 9, 8, 7, 'final', 0/" .bumpversion.cfg
sed -i -E 's/= VersionInfo\(.*\)/= VersionInfo\(9, 8, 7, "final", 0\)/' notebook/_version.py
cat notebook/_version.py
sed -i -E 's/current_version = .*/current_version = 9, 8, 7, "final", 0/' .bumpversion.cfg
cat .bumpversion.cfg
jlpm run lerna version 9.8.7 --no-push --force-publish --no-git-tag-version --yes
git commit -am "Release 9.8.7"

Expand Down
46 changes: 23 additions & 23 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,31 @@ repos:
rev: v4.1.0
hooks:
- id: forbid-new-submodules
# - id: end-of-file-fixer
# - id: check-case-conflict
# - id: check-executables-have-shebangs
# - id: requirements-txt-fixer
# - id: check-added-large-files
# - id: check-case-conflict
# - id: check-toml
# - id: check-yaml
# - id: debug-statements
# - id: check-builtin-literals
# - id: trailing-whitespace
# exclude: .bumpversion.cfg
- id: end-of-file-fixer
- id: check-case-conflict
- id: check-executables-have-shebangs
- id: requirements-txt-fixer
- id: check-added-large-files
- id: check-case-conflict
- id: check-toml
- id: check-yaml
- id: debug-statements
- id: check-builtin-literals
- id: trailing-whitespace
exclude: .bumpversion.cfg

# - repo: https://github.com/psf/black
# rev: 22.3.0
# hooks:
# - id: black
# args: ["--line-length", "100"]
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
args: ["--line-length", "100"]

# - repo: https://github.com/PyCQA/isort
# rev: 5.10.1
# hooks:
# - id: isort
# files: \.py$
# args: [--profile=black]
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
hooks:
- id: isort
files: \.py$
args: [--profile=black]

# - repo: https://github.com/pycqa/flake8
# rev: 4.0.1
Expand Down
6 changes: 3 additions & 3 deletions docs/doc-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sphinx>=1.3.6
pydata-sphinx-theme
myst_parser
nbsphinx
pydata-sphinx-theme
sphinx>=1.3.6
sphinxcontrib_github_alt
myst_parser
Loading