Skip to content
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
27 changes: 10 additions & 17 deletions .github/workflows/build-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Build & Tests

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]

jobs:
build-tests:
Expand All @@ -13,31 +13,24 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ windows-latest, macos-latest, ubuntu-latest ]
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
os: [windows-latest, macos-latest, ubuntu-latest]
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
defaults:
run:
shell: bash

steps:
- uses: actions/checkout@v6
- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v6
- name: Install uv and set the Python version
uses: astral-sh/setup-uv@v7
with:
python-version: ${{ matrix.python-version }}
- name: Setup Poetry
uses: snok/install-poetry@v1
with:
virtualenvs-create: true
virtualenvs-in-project: true
- name: Restore dependencies
run: poetry install --no-interaction --no-root
- name: Install the project
run: uv sync --locked --all-extras --dev
- name: Test
run: |
source $VENV
pytest --cov pyfluids --cov-report=xml
run: uv run pytest --cov pyfluids --cov-report=xml
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
files: ./coverage.xml
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL"

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]
schedule:
- cron: "31 19 * * 1"

Expand All @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ "python" ]
language: ["python"]

steps:
- name: Checkout repository
Expand Down
17 changes: 5 additions & 12 deletions .github/workflows/publish-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish to PyPI

on:
release:
types: [ published ]
types: [published]

permissions:
contents: read
Expand All @@ -14,19 +14,12 @@ jobs:

steps:
- uses: actions/checkout@v6
- name: Setup Python
uses: actions/setup-python@v6
- name: Install uv and set the Python version
uses: astral-sh/setup-uv@v7
with:
python-version: "3.13"
- name: Setup Poetry
uses: snok/install-poetry@v1
with:
virtualenvs-create: true
virtualenvs-in-project: true
- name: Restore dependencies
run: poetry install --no-interaction --no-root
python-version: 3.13
- name: Build package
run: poetry build
run: uv build
- name: Publish package to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
Expand Down
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"python-envs.defaultEnvManager": "ms-python.python:system",
"python-envs.defaultPackageManager": "ms-python.python:pip",
"python-envs.pythonProjects": []
}
412 changes: 0 additions & 412 deletions poetry.lock

This file was deleted.

39 changes: 16 additions & 23 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
[tool.poetry]
[project]
name = "pyfluids"
version = "2.8.2"
description = "Simple, full-featured, lightweight CoolProp wrapper for Python"
authors = [
"Vladimir Portyanikhin <v.portyanikhin@ya.ru>",
]
license = "MIT"
readme = "PyPI.md"
homepage = "https://github.com/portyanikhin/PyFluids"
repository = "https://github.com/portyanikhin/PyFluids"
documentation = "https://github.com/portyanikhin/PyFluids"
requires-python = ">=3.9, <3.14"
license = "MIT"
authors = [{ name = "Vladimir Portyanikhin", email = "v.portyanikhin@ya.ru" }]
keywords = [
"CoolProp",
"fluids",
Expand Down Expand Up @@ -48,23 +44,20 @@ classifiers = [
"Topic :: Scientific/Engineering :: Chemistry",
"Topic :: Scientific/Engineering :: Physics",
]
packages = [
{ include = "pyfluids" },
]
dependencies = ["CoolProp==7.1.0", "tomli~=2.3"]

[tool.poetry.dependencies]
python = ">=3.9, <3.14"
CoolProp = "7.1.0"
tomli = "2.3.0"
[dependency-groups]
dev = ["pytest~=8.4", "pytest-asyncio~=1.2", "pytest-cov~=7.0"]

[tool.poetry.group.test.dependencies]
pytest = "8.4.2"
pytest-asyncio = "1.2.0"
pytest-cov = "7.0.0"
[project.urls]
homepage = "https://github.com/portyanikhin/PyFluids"
source = "https://github.com/portyanikhin/PyFluids"
releasenotes = "https://github.com/portyanikhin/PyFluids/releases"
documentation = "https://github.com/portyanikhin/PyFluids"

[build-system]
requires = ["uv_build~=0.9"]
build-backend = "uv_build"

[tool.pytest.ini_options]
asyncio_default_fixture_loop_scope = "function"

[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
455 changes: 455 additions & 0 deletions uv.lock

Large diffs are not rendered by default.