Skip to content

Commit

Permalink
Merge pull request #109 from chmp/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
chmp authored Feb 18, 2024
2 parents adaf0f7 + 00def7e commit 748d282
Show file tree
Hide file tree
Showing 7 changed files with 586 additions and 562 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
},
"steps": [
{
"uses": "actions/checkout@v3"
"uses": "actions/checkout@v4"
},
{
"name": "Set up Python",
"uses": "actions/setup-python@v4",
"with": {
"python-version": "3.11"
"python-version": "3.12"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
"runs-on": "ubuntu-latest",
"steps": [
{
"uses": "actions/checkout@v3"
"uses": "actions/checkout@v4"
},
{
"name": "Set up Python",
"uses": "actions/setup-python@v4",
"with": {
"python-version": "3.11"
"python-version": "3.12"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Note: development is tracked on the [`develop` branch](https://github.com/chmp/i

## `0.14.0`

- Removed support for Python 3.7 since reached its end of life
- Updated the dev-requirements
- Removed support for Python 3.7 after it reached its end of life
- Updated the dev-requirements (in particular `pytest==8.0.0`)
- Remove deprecated API (`ipytest.clean_tests`, `%%pytest`, `%%pytest[clean]`)

## `0.13.3`
Expand Down
572 changes: 293 additions & 279 deletions poetry.lock

Large diffs are not rendered by default.

9 changes: 3 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "ipytest"
version = "0.14.0b1"
version = "0.14.0"

authors = ["Christopher Prohm <[email protected]>"]

Expand Down Expand Up @@ -30,7 +30,7 @@ optional = true

[tool.poetry.group.dev.dependencies]
nbval = "^0.10.0"
ruff = "^0.1.13"
ruff = "^0.2.0"
pytest-asyncio = "^0.23.0"
build = "^1.0"
poetry = "^1.7"
Expand All @@ -43,10 +43,7 @@ build-backend = "poetry.core.masonry.api"
[project.urls]
repository = "https://github.com/chmp/ipytest"

[tool.setuptools]
packages = ["ipytest"]

[tool.ruff]
[tool.ruff.lint]
select = [
"E",
"F",
Expand Down
551 changes: 282 additions & 269 deletions requirements-dev.txt

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions x.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def integration():


@cmd()
def compile_requirements():
def lock():
_sh(f"{python} -m poetry lock")
_sh(
f"{python} -m poetry export --with=dev "
Expand All @@ -103,7 +103,7 @@ def parse_file_version(p, suffix):

if __name__ == "__main__":
_sps = (_p := __import__("argparse").ArgumentParser()).add_subparsers()
for _f in (f for f in list(globals().values()) if hasattr(f, "@cmd")):
for _f in (f for _, f in sorted(globals().items()) if hasattr(f, "@cmd")):
_sp = _sps.add_parser(_f.__name__.replace("_", "-"), **getattr(_f, "@cmd"))
_sp.set_defaults(_=_f)
[_sp.add_argument(*a, **kw) for a, kw in reversed(getattr(_f, "@arg", []))]
Expand Down

0 comments on commit 748d282

Please sign in to comment.