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

precommit #1111

Merged
merged 3 commits into from
Jul 15, 2024
Merged
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
2 changes: 1 addition & 1 deletion .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ coverage:
flags:
tests:
paths:
- tests/
- tests/
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[run]
source =
source =
regolith/
[report]
omit =
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: install regolith requirements
shell: bash -l {0}
run: |
conda config --set always_yes yes --set changeps1 no
conda config --set always_yes yes --set changeps1 no
conda config --add channels conda-forge
conda activate test
conda install --file requirements/run.txt
Expand Down
32 changes: 23 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,43 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
default_language_version:
python: python3
ci:
autofix_commit_msg: |
[pre-commit.ci] auto fixes from pre-commit hooks
autofix_prs: true
autoupdate_branch: 'pre-commit-autoupdate'
autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate'
autoupdate_schedule: monthly
skip: [no-commit-to-branch]
submodules: false
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.6.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
- id: check-added-large-files
- repo: https://github.com/ambv/black
rev: 23.3.0
exclude: '\.(rst|txt)$'
- repo: https://github.com/psf/black
rev: 24.4.2
hooks:
- id: black
- repo: https://github.com/pycqa/flake8
rev: 6.0.0
rev: 7.0.0
hooks:
- id: flake8
- repo: https://github.com/pycqa/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
args: ["--profile", "black"]
- repo: https://github.com/kynan/nbstripout
rev: 0.6.1
rev: 0.7.1
hooks:
- id: nbstripout
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: no-commit-to-branch
name: Prevent Commit to Main Branch
args: ["--branch", "main"]
stages: [pre-commit]
4 changes: 0 additions & 4 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,3 @@ v0.1.4
**Changed:**

* People page only shows current members, former members on Former Members page




2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,5 @@ For more information, please see

----------------------------------

NOTE: ace and jsoneditor in the regolith/static/ dir are covered under their own
NOTE: ace and jsoneditor in the regolith/static/ dir are covered under their own
licences.
2 changes: 1 addition & 1 deletion docs/_static/regolith-logo-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/_static/regolith-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 4 additions & 9 deletions docs/_static/rg-dungeon.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function onKeyDown(k) {
tick();
}

// Maze functions modified from the ones at
// Maze functions modified from the ones at
// http://rosettacode.org/wiki/Maze_generation#JavaScript
function mazegen(x,y) {
var n=x*y-1;
Expand Down Expand Up @@ -99,10 +99,10 @@ function mazegen(x,y) {
unvisited[next[0]+1][next[1]+1]= false;
if (next[0] == here[0])
horiz[next[0]][(next[1]+here[1]-1)/2]= true;
else
else
verti[(next[0]+here[0]-1)/2][next[1]]= true;
path.push(here= next);
} else
} else
here= path.pop();
}
return ({x: x, y: y, horiz: horiz, verti: verti});
Expand All @@ -120,7 +120,7 @@ function mazedisplay(m) {
var line= [];
if (0 == j%2)
for (var k=0; k<m.y*4+1; k++)
if (0 == k%4)
if (0 == k%4)
line[k]= '#';
else
if (j>0 && m.verti[j/2-1][Math.floor(k/4)])
Expand Down Expand Up @@ -162,8 +162,3 @@ function initRgDungeon() {
ut.initInput(onKeyDown);
console.log(rgmap.join('\n'));
}





1 change: 0 additions & 1 deletion docs/_static/unicodetiles.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion docs/api/tools.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ Tools (``regolith.tools``)
:members:
:undoc-members:
:inherited-members:

2 changes: 1 addition & 1 deletion docs/collections/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ The following contain the regolith schemas and examples in both YAML and JSON/Mo
proposalReviews
proposals
refereeReports
students
students
2 changes: 1 addition & 1 deletion docs/collections/news.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ JSON/Mongo Example
"body": "Dr. Robert Flanagan joined ERGS as a post-doctoral scholar.",
"day": 1,
"month": "February",
"year": 2016}
"year": 2016}
2 changes: 1 addition & 1 deletion docs/commands/fs-to-mongo.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ https://www.mongodb.com/try/download/community
"path": "db",
"local": true}
]
}
}
2 changes: 1 addition & 1 deletion docs/commands/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ Shell commands for regolith
rc
store
validate
yaml-to-json
yaml-to-json
Loading
Loading