Skip to content

Commit 3543443

Browse files
authored
#27 Merge pull request from fmlo-dev/astropenguin/issue25
Update project dependencies
2 parents ed85f78 + c23adc1 commit 3543443

21 files changed

Lines changed: 1730 additions & 1810 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

.devcontainer/devcontainer.json

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,35 @@
11
{
22
"name": "fmflow",
3-
"build": {
4-
"context": "..",
5-
"dockerfile": "Dockerfile"
3+
"image":"python:3.12",
4+
"containerEnv": {
5+
"POETRY_VIRTUALENVS_CREATE": "false"
66
},
7-
"postCreateCommand": "poetry install",
8-
"extensions": [
9-
"github.vscode-pull-request-github",
10-
"mhutchie.git-graph",
11-
"ms-python.python",
12-
"streetsidesoftware.code-spell-checker",
13-
"tamasfe.even-better-toml"
7+
"runArgs": [
8+
"--name=fmflow"
149
],
15-
"settings": {
16-
"files.insertFinalNewline": true,
17-
"files.trimTrailingWhitespace": true,
18-
"python.formatting.provider": "black",
19-
"python.languageServer": "Pylance",
20-
"[python]": {
21-
"editor.formatOnSave": true,
22-
"editor.insertSpaces": true,
23-
"editor.tabSize": 4
10+
"onCreateCommand": "pip install poetry==1.8.5",
11+
"postCreateCommand": "poetry install",
12+
"customizations": {
13+
"vscode": {
14+
"extensions": [
15+
"github.vscode-pull-request-github",
16+
"mhutchie.git-graph",
17+
"ms-python.black-formatter",
18+
"ms-python.python",
19+
"streetsidesoftware.code-spell-checker",
20+
"tamasfe.even-better-toml"
21+
],
22+
"settings": {
23+
"files.insertFinalNewline": true,
24+
"files.trimTrailingWhitespace": true,
25+
"[python]": {
26+
"editor.defaultFormatter": "ms-python.black-formatter",
27+
"editor.formatOnSave": true,
28+
"editor.insertSpaces": true,
29+
"editor.tabSize": 4,
30+
"python.languageServer": "Pylance"
31+
}
32+
}
2433
}
2534
}
2635
}
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ jobs:
1212
env:
1313
POETRY_VIRTUALENVS_CREATE: false
1414
steps:
15-
- uses: actions/checkout@v2
16-
- uses: actions/setup-python@v2
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-python@v5
1717
with:
18-
python-version: "3.10"
19-
- name: Install project dependencies
20-
run: pip install poetry && poetry install
21-
- name: Build docs
22-
run: docs/build
23-
- name: Deploy docs
24-
uses: peaceiris/actions-gh-pages@v3
18+
python-version: "3.12
19+
- uses: abatilo/actions-poetry@v3
20+
with:
21+
poetry-version: "1.8.5"
22+
- run: poetry install
23+
- run: docs/build
24+
- uses: peaceiris/actions-gh-pages@v3
2525
with:
2626
force_orphan: true
2727
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pypi.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: PyPI
2+
3+
on:
4+
release:
5+
types:
6+
- created
7+
8+
jobs:
9+
job:
10+
name: PyPI
11+
runs-on: ubuntu-latest
12+
env:
13+
POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
14+
steps:
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-python@v5
17+
with:
18+
python-version: "3.12"
19+
- uses: abatilo/actions-poetry@v3
20+
with:
21+
poetry-version: "1.8.5"
22+
- run: poetry publish --build

.github/workflows/pypi.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/tests.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
11+
jobs:
12+
job:
13+
name: Test (Python ${{ matrix.python }})
14+
runs-on: ubuntu-latest
15+
env:
16+
POETRY_VIRTUALENVS_CREATE: false
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
python: ["3.10", "3.11", "3.12"]
21+
steps:
22+
- uses: actions/checkout@v4
23+
with:
24+
submodules: true
25+
- uses: actions/setup-python@v5
26+
with:
27+
python-version: ${{ matrix.python }}
28+
- uses: abatilo/actions-poetry@v3
29+
with:
30+
poetry-version: "1.8.5"
31+
- run: poetry install
32+
- run: black --check docs fmflow tests
33+
- run: pytest -v tests
34+
- run: docs/build

.github/workflows/tests.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

CITATION.cff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ message: "If you use this software, please cite it as below."
33

44
title: "fmflow"
55
abstract: "Data analysis package for FMLO"
6-
version: 0.4.0
7-
date-released: 2022-09-09
6+
version: 0.5.0
7+
date-released: 2025-03-19
88
license: "MIT"
99
doi: "10.5281/zenodo.3433962"
1010
url: "https://github.com/fmlo-dev/fmflow"
1111
authors:
1212
- given-names: "Akio"
1313
family-names: "Taniguchi"
14-
affiliation: "Nagoya University"
14+
affiliation: "Kitami Institute of Technology"
1515
orcid: "https://orcid.org/0000-0002-9695-6183"

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017-2022 Akio Taniguchi
3+
Copyright (c) 2017-2025 Akio Taniguchi
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
[![Python](https://img.shields.io/pypi/pyversions/fmflow?label=Python&color=cornflowerblue&style=flat-square)](https://pypi.org/project/fmflow/)
55
[![Downloads](https://img.shields.io/pypi/dm/fmflow?label=Downloads&color=cornflowerblue&style=flat-square)](https://pepy.tech/project/fmflow)
66
[![DOI](https://img.shields.io/badge/DOI-10.5281/zenodo.3433962-cornflowerblue?style=flat-square)](https://doi.org/10.5281/zenodo.3433962)
7-
[![Tests](https://img.shields.io/github/workflow/status/fmlo-dev/fmflow/Tests?label=Tests&style=flat-square)](https://github.com/fmlo-dev/fmflow/actions)
7+
[![Tests](https://img.shields.io/github/actions/workflow/status/fmlo-dev/fmflow/tests.yaml?label=Tests&style=flat-square)](https://github.com/fmlo-dev/fmflow/actions)
88

99
Data analysis package for FMLO

0 commit comments

Comments
 (0)