Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated imports of Pint to remove pin #93

Merged
merged 5 commits into from
Jul 25, 2024
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
15 changes: 10 additions & 5 deletions DEVEL.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Contributing

## Development requirement
Check [requirements/dev.txt](requirements/dev.txt).
Make sure the formatter package [black](https://black.readthedocs.io/en/stable/)>=24.3.

## How to test

Minimally needed:
Expand Down Expand Up @@ -53,8 +57,9 @@ pytest tests/integration
2. Develop into the newly created branch
3. Create appropriate unit tests in [tests/unit/](https://github.com/PaNOSC-ViNYL/libpyvinyl/tree/master/tests/unit)
4. Test current development as indicated in [Testing](https://github.com/PaNOSC-ViNYL/libpyvinyl#testing).
5. `git rebase -i master` w.r.t. current master to include the latest updates and squashing commits to a minimum. See also [here](https://opensource.com/article/20/4/git-rebase-i).
6. Push your `BRANCH` to the upstream repo: `git push -f upstream BRANCH`.
7. Create a pull request (PR) to the `master` branch on the GitHub page.
8. PR should be reviewed and approved and be passing all CI tests.
9. If passing all tests, Choose `Rebase and merge` to merge the PR with no further squashing.
5. Format the code with [black](https://black.readthedocs.io/en/stable/)>=24.3
6. `git rebase -i master` w.r.t. current master to include the latest updates and squashing commits to a minimum. See also [here](https://opensource.com/article/20/4/git-rebase-i).
7. Push your `BRANCH` to the upstream repo: `git push -f upstream BRANCH`.
8. Create a pull request (PR) to the `master` branch on the GitHub page.
9. PR should be reviewed and approved and be passing all CI tests.
10. If passing all tests, Choose `Rebase and merge` to merge the PR with no further squashing.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

Requires:
```
python >= 3.6
python >= 3.8
```

Simulations provide invaluable insights to plan (before) and
Expand Down Expand Up @@ -80,6 +80,9 @@ pip install requirements.txt
make html
```

## Development guide
Please find the development guide [here](DEVEL.md).

## Acknowledgement

This project has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreement No. 823852.
1 change: 1 addition & 0 deletions libpyvinyl/BaseData.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
""" :module BaseData: Module hosts the BaseData class."""

from typing import Union, Optional
from abc import abstractmethod, ABCMeta
from libpyvinyl.AbstractBaseClass import AbstractBaseClass
Expand Down
4 changes: 2 additions & 2 deletions libpyvinyl/Parameters/Collections.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

from libpyvinyl.AbstractBaseClass import AbstractBaseClass
from .Parameter import Parameter
from pint.quantity import Quantity
from pint.unit import Unit, UnitsContainer
from pint import Unit, Quantity
from pint.util import UnitsContainer

from typing import Union

Expand Down
4 changes: 2 additions & 2 deletions libpyvinyl/Parameters/Parameter.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import numpy
from libpyvinyl.AbstractBaseClass import AbstractBaseClass

from pint.unit import Unit
from pint.quantity import Quantity
from pint import Unit
from pint import Quantity
import pint.errors

# typing
Expand Down
1 change: 1 addition & 0 deletions libpyvinyl/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
""" :module: Exposes all user facing classes in the common libpyvinyl namespace"""

__author__ = "Carsten Fortmann-Grote, Mads Bertelsen, Juncheng E, Shervin Nourbakhsh"
__email__ = "[email protected], [email protected], [email protected], [email protected]"
__version__ = "1.2.5"
Expand Down
2 changes: 1 addition & 1 deletion requirements/prod.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pint<=0.19.2
pint
dill<=0.3.5.1
scipy
jsons
Expand Down
1 change: 1 addition & 0 deletions tests/integration/plusminus/plusminus/BaseCalculator.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
""" :module BaseCalculator: Module hosts the BaseData class."""

from abc import abstractmethod, ABCMeta
from typing import Union
from pathlib import Path
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/test_Parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import pytest
import os
import tempfile
from pint.quantity import Quantity
from pint.unit import Unit
from pint import Quantity
from pint import Unit
from libpyvinyl.Parameters import Parameter
from libpyvinyl.Parameters import CalculatorParameters
from libpyvinyl.Parameters import InstrumentParameters
Expand Down
Loading