Skip to content

Commit

Permalink
Merge pull request #522 from NREL/521_bugfix
Browse files Browse the repository at this point in the history
521 bugfix
  • Loading branch information
cdeline authored Aug 20, 2024
2 parents e34a129 + 99cd9eb commit c537b93
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 2,358 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:

runs-on: ubuntu-latest
strategy:
fail-fast: true # cancel other matrix jobs when one fails
fail-fast: false # don't cancel other matrix jobs when one fails
matrix:
python-version: ["3.8", "3.10"]
python-version: ["3.8","3.11"]
# Test two environments:
# 1) dependencies with pinned versions from requirements.txt
# 2) 'pip install --upgrade --upgrade-strategy=eager .' to install upgraded
Expand All @@ -20,10 +20,10 @@ jobs:
]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
echo "/home/runner/work/bifacial_radiance/bifacial_radiance/SMARTS_295_Linux" >> $GITHUB_PATH
- name: Test with pytest ${{ matrix.env }}
uses: GabrielBB/xvfb-action@v1 # GUI testing requires xvfb
uses: coactions/setup-xvfb@v1 # GUI testing requires xvfb
with:
run: |
pytest --cov=bifacial_radiance
Expand All @@ -69,6 +69,7 @@ jobs:
SMARTSPATH: /home/runner/work/bifacial_radiance/bifacial_radiance/SMARTS_295_Linux

- name: Coveralls
if: matrix.python-version == 3.11 # && ${{ matrix.env }} == '-r requirements.txt .[all]'
run: |
coveralls --service=github
env:
Expand Down
18 changes: 15 additions & 3 deletions bifacial_radiance/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
try:
from importlib.metadata import PackageNotFoundError, version
except ImportError:
# for python < 3.8 (remove when dropping 3.7 support)
from importlib_metadata import PackageNotFoundError, version

try:
__version__ = version(__package__)
except PackageNotFoundError:
__version__ = "0+unknown"


from bifacial_radiance.main import AnalysisObj, GroundObj, MetObj, RadianceObj, SceneObj
#from bifacial_radiance.readepw import readepw
from bifacial_radiance.module import ModuleObj
Expand All @@ -7,6 +19,6 @@
from bifacial_radiance import mismatch
from bifacial_radiance.spectral_utils import generate_spectra
from bifacial_radiance import performance
from ._version import get_versions
__version__ = get_versions()['version']
del get_versions
#from ._version import get_versions
#__version__ = get_versions()['version']
#del get_versions
Loading

0 comments on commit c537b93

Please sign in to comment.