Skip to content

Commit

Permalink
Merge branch 'main' into uv-ci-test-lowest-highest-dep-resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
janosh authored Sep 18, 2024
2 parents e509d06 + 1cfdf30 commit 057c2d4
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ changelog:
- enhancement
- title: Documentation 📖
labels:
- documentation
- docs
- title: House-Keeping 🧹
labels:
- house-keeping
Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@
# Change log

## v0.1.18

### Bug Fixes 🐛
* FIX: Properly jsanitize fireworks Task by @gpetretto in https://github.com/materialsproject/jobflow/pull/544
* fix @job annotation (again) by @FabiPi3 in https://github.com/materialsproject/jobflow/pull/579

### Enhancements 🛠
* Add `job_dir` attribute to `Response` class to record where a job ran by @janosh in https://github.com/materialsproject/jobflow/pull/570
* Add type hint for @job and fix for run_locally by @FabiPi3 in https://github.com/materialsproject/jobflow/pull/578
* Add dynamic option to append_name by @JaGeo in https://github.com/materialsproject/jobflow/pull/644

### Documentation 📖
* Fix `JobStore.from_file` docstring by @Andrew-S-Rosen in https://github.com/materialsproject/jobflow/pull/543
* Added logo by @davidwaroquiers in https://github.com/materialsproject/jobflow/pull/569
* fix firework command bug in doc by @chiang-yuan in https://github.com/materialsproject/jobflow/pull/589
* Add JFR to readme. by @utf in https://github.com/materialsproject/jobflow/pull/595

### House-Keeping 🧹
* Migrate from `pip` to `uv` for CI dependency install by @janosh in https://github.com/materialsproject/jobflow/pull/574
* Bump `ruff` and fix errors by @janosh in https://github.com/materialsproject/jobflow/pull/593

### New Contributors
* @FabiPi3 made their first contribution in https://github.com/materialsproject/jobflow/pull/578
* @chiang-yuan made their first contribution in https://github.com/materialsproject/jobflow/pull/589

**Full Changelog**: https://github.com/materialsproject/jobflow/compare/v0.1.17...v0.1.18

## v0.1.17

### New Features 🎉
Expand Down
26 changes: 13 additions & 13 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,28 +39,28 @@ dependencies = [
ulid = ["python-ulid"]
docs = [
"autodoc_pydantic==2.1.0",
"furo==2024.5.6",
"ipython==8.26.0",
"myst_parser==3.0.1",
"nbsphinx==0.9.4",
"furo==2024.8.6",
"ipython==8.27.0",
"myst_parser==4.0.0",
"nbsphinx==0.9.5",
"sphinx-copybutton==0.5.2",
"sphinx==7.4.4",
"sphinx==8.0.2",
]
dev = ["pre-commit>=2.12.1", "typing_extensions; python_version < '3.11'"]
tests = ["moto==4.2.13", "pytest-cov==5.0.0", "pytest==8.2.2"]
tests = ["moto==4.2.13", "pytest-cov==5.0.0", "pytest==8.3.3"]
vis = ["matplotlib", "pydot"]
fireworks = ["FireWorks"]
strict = [
"FireWorks==2.0.3",
"PyYAML==6.0.1",
"maggma==0.69.0",
"matplotlib==3.9.1",
"monty==2024.7.12",
"PyYAML==6.0.2",
"maggma==0.69.3",
"matplotlib==3.9.2",
"monty==2024.7.30",
"moto==4.2.13",
"networkx==3.2.1",
"pydantic-settings==2.3.4",
"pydantic==2.8.2",
"pydash==8.0.1",
"pydantic-settings==2.5.2",
"pydantic==2.9.1",
"pydash==8.0.3",
"pydot==2.0.0",
"python-ulid==2.7.0",
"typing-extensions==4.12.2",
Expand Down
11 changes: 8 additions & 3 deletions src/jobflow/core/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,22 @@ class JobConfig(MSONable):


@overload
def job(method: Callable = None) -> Callable[..., Job]:
def job(method: Callable | None = None) -> Callable[..., Job]:
pass


@overload
def job(method: Callable = None, **job_kwargs) -> Callable[..., Callable[..., Job]]:
def job(method: Callable, **job_kwargs) -> Callable[..., Job]:
pass


@overload
def job(method: None = None, **job_kwargs) -> Callable[..., Callable[..., Job]]:
pass


def job(
method: Callable = None, **job_kwargs
method: Callable | None = None, **job_kwargs
) -> Callable[..., Job] | Callable[..., Callable[..., Job]]:
"""
Wrap a function to produce a :obj:`Job`.
Expand Down

0 comments on commit 057c2d4

Please sign in to comment.