Skip to content

Commit

Permalink
Merge pull request #206 from MC-kit/devel
Browse files Browse the repository at this point in the history
Devel
  • Loading branch information
dvp2015 authored Jun 19, 2023
2 parents 5d391c0 + a4305b9 commit bc7ad5b
Show file tree
Hide file tree
Showing 7 changed files with 270 additions and 379 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repository
uses: actions/[email protected].2
uses: actions/[email protected].3

- name: Sync GitHub Issue Labels
uses: crazy-max/ghaction-github-labeler@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Check out the repository
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
fetch-depth: 2 # need previous revision to define tag

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
!contains(github.event.head_commit.message, '[skip_ci]')
steps:
- name: Check out the repository
uses: actions/[email protected].2
uses: actions/[email protected].3

- name: Set up Python 3.10 # on 3.11 pip install in unstable: "canonicalize" fails occasionally
uses: actions/[email protected]
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
needs: lint
steps:
- name: Check out the repository
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
fetch-depth: 1

Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
steps:

- name: Checkout repository
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
fetch-depth: 1

Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
steps:

- name: Check out the repository
uses: actions/[email protected].2
uses: actions/[email protected].3

- name: Set up Python 3.11
uses: actions/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ def docs(s: Session) -> None:


@nox.session(python=False)
def clean(_):
def clean(_: Session) -> None:
"""Clean folders with reproducible content."""
to_clean = [
".benchmarks",
Expand All @@ -346,7 +346,7 @@ def clean(_):
_clean_docs_build_folder()


def _clean_docs_build_folder():
def _clean_docs_build_folder() -> None:
build_dir = Path("docs", "_build")
if build_dir.exists():
shutil.rmtree(build_dir)
622 changes: 257 additions & 365 deletions poetry.lock

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "xpypact"
version = "0.4.2"
version = "0.4.3"
description = "\"Python tools to work with elements and isotopes\""
authors = ["dvp <[email protected]>"]
license = "MIT"
Expand Down Expand Up @@ -71,14 +71,13 @@ tomli = { version = ">=2.0.1", python="<3.11" }
[tool.poetry.group.pre_commit.dependencies]
pre-commit = ">=2.15.0"
rstcheck = ">=3.3.1"
pydocstringformatter = "^0.7.3"
pydocstringformatter = ">=0.7.3"

[tool.poetry.group.black.dependencies]
black = ">=22.8.0" #TODO dvp: update with safety and packaging

[tool.poetry.group.isort.dependencies]
isort = ">=5.9.3"
pycln = {version = "^2.1.1", extras = ["click"]}

[tool.poetry.group.test.dependencies]
pytest = ">=7.1"
Expand Down Expand Up @@ -328,7 +327,7 @@ ignore_missing_imports = true
[[tool.mypy.overrides]]
module = [
"tomllib",
"tomli"
"tomli",
]
allow_redefinition = true
disable_error_code = "no-redef"
Expand Down
4 changes: 2 additions & 2 deletions tools/reset-pyenv
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ reset() {
local env="${1:-}"
local pkgs=( $(ls src) )
local pkg=${pkgs[0]}
local last_python="3.11.3"
local last_python="3.11.4"
[[ -z "$env" ]] && env="${pkg//_/-}"
echo "Installing package $pkg to environment $env with python $last_python."
eval "$(pyenv init -)"
Expand All @@ -32,7 +32,7 @@ reset() {
poetry install
python -c "import ${pkg}; print(${pkg}.__version__)" && success "Environment $env is reset"
pyenv shell --unset
pyenv local "$env" "3.10.11" "3.9.16" "3.8.16"
pyenv local "$env" "3.10.12" "3.9.17" "3.8.17"
pyenv rehash
}

Expand Down

0 comments on commit bc7ad5b

Please sign in to comment.