Skip to content

Commit

Permalink
Update failing test and build arm64 and aarch64 4.0.1 (#143)
Browse files Browse the repository at this point in the history
* files for pysam 2.2.4

* update build_manylinux.sh

* update tests and conda build

* update SAM_api files

* closes #89 certifi certificates in fetchresource

* fixes #94

* start v 2.3.0

* fix #69

* changes from 2021.12.2 release

* add VersionChanges.rst

* add version_differ.py

* add more release info

* update version_differ.py doc str

* correct version_differ.py with PySSC

* add python 3.10

* fix getting env variables during build and remove pandas dependency

* fix test_ResouceTools.py

* switch to manylinux2010 for Python 3.10 support

* update pysam files

* update PySAM files

* Update docs for Version 3.0.1

* close #109

* remove stubs package dependency

* removal of stubs package

* Apple Silicon and Intel Wheel

pip3 install --extra-index-url https://test.pypi.org/simple/ NREL_PySAM

* update files and test

* Add utility rate forecast example for new stateful cmod (#119)

* Add utility rate forecast example for new stateful cmod

* Update failing test_Reopt_sizing.py

Add sys.SolarResource.wf_use_albedo = 0

* some stubs changes from develop. Additional documentation for utility rate forecast script

* Additional subs files from comd_utilityrateforcast sam branches and develop

* Correct energy charge schedule fields to match number of periods in energy charge fields

* add tests and improve comments in example

Co-authored-by: sjanzou <sjanzou@gmail.com>

* PySAM documentation revisions

* update setup and tests

* update files

* update versions.rst

* update rsts

* updates for v3.0.2

* update build_manylinux.sh

* update comments

* Modifications to PySSC to handle the conventions form ssc PR 907, plus module and docs updates to match

* Pysam 116 urdb version 8 (#126)

* Add resourcetools processing for urdbv8, update examples. currently fails on ur_yearzero_usage_peaks

* Add new loadtools function to convert hourly data into monthly peaks

* Mark urdb version as depricated. Move urdbv8 to new utility rate tools library. Update examples and tests

* Fix #128 - correctly apply urdb flatdemandmonths to determine tiers

* pysam v4.0.0

* update test

* add error check to build_win.bat

* fix docs

* update cmake version

* update platform tag for manylinux2014

* update files

* Fix wind resource download in ResourceTools.py

Now that Windpower supports WIND Toolkit CSV file format, no need to convert to SRW.

* Update failing test and build arm64 and aarch64 4.0.1

* twine works for arm64 wheels but manylinux1_aarch64 not supported

anaconda upload fails with 
Extracting conda package attributes for upload
Creating package "nrel-pysam"
Creating release "4.1.0"
[ERROR] ('"nrel-pysam" could not be found', 404)

---------

Co-authored-by: dguittet <dguittet@nrel.gov>
Co-authored-by: Brian Mirletz <brian.mirletz@nrel.gov>
Co-authored-by: Paul Gilman <cpaulgilman@gmail.com>
  • Loading branch information
4 people authored Feb 26, 2023
1 parent d68869a commit 3f8a229
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 17 deletions.
7 changes: 1 addition & 6 deletions Examples/PySAMWorkshop.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -499,12 +499,7 @@
"10\t40\t-131785.9623201237\n",
"20\t80\t-128677.60802359802\n",
"30\t120\t-126139.5470983437\n",
"40\t160\t-124008.21375974927\n",
"50\t200\t-122370.41286229316\n",
"60\t240\t-121195.8741064144\n",
"70\t280\t-120204.21945391552\n",
"80\t320\t-119364.5472159505\n",
"90\t360\t-118652.03934307654\n"
"40\t160\t-124008.21375974927\n"
]
}
],
Expand Down
14 changes: 4 additions & 10 deletions build_unix_arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,11 @@
#
# Building for Mac
#
export ROOTDIR=/Users/imacuser/Public/Projects/GitHub/NREL
export LKDIR=/Users/imacuser/Public/Projects/GitHub/NREL/lk
export WEXDIR=/Users/imacuser/Public/Projects/GitHub/NREL/wex
export SSCDIR=/Users/imacuser/Public/Projects/GitHub/NREL/ssc
export SAMNTDIR=/Users/imacuser/Public/Projects/GitHub/NREL/SAM
export PYSAMDIR=/Users/imacuser/Public/Projects/GitHub/NREL/pysam

source ~/.env

# Building libssc and libSAM_api
# requires $ROOTDIR/CMakeList.txt that contains lk, wex, ssc and sam as subdirectories

rm -rf $ROOTDIR/cmake-build-release
mkdir -p $ROOTDIR/cmake-build-release
cd $ROOTDIR/cmake-build-release || exit
cmake .. -DCMAKE_BUILD_TYPE=Release -DSAMAPI_EXPORT=1 -DSAM_SKIP_AUTOGEN=0
Expand Down Expand Up @@ -61,7 +55,7 @@ docker pull continuumio/anaconda
docker run --rm --env PYSAMDIR=/io/pysam -v $(pwd):/io continuumio/anaconda /io/pysam/build_conda_arm64.sh


#twine upload $PYSAMDIR/dist/*.whl
#anaconda upload -u nrel $PYSAMDIR/dist/osx-64/*.tar.bz2
twine upload $PYSAMDIR/dist/*.whl
anaconda upload -u nrel $PYSAMDIR/dist/osx-arm64/*.tar.bz2
#anaconda upload -u nrel $PYSAMDIR/dist/linux-64/*.tar.bz2

2 changes: 1 addition & 1 deletion tests/test_ResourceTools.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,6 @@ def test_resourcefilefetcher():
with open(wtk_fp, mode='r') as f:
wtk_csv = csv.DictReader(f)
list(wtk_csv)
assert wtk_csv.line_num == 8764 + 1
assert wtk_csv.line_num == 8761 + 1

shutil.rmtree(resource_dir)

0 comments on commit 3f8a229

Please sign in to comment.