Skip to content

Commit

Permalink
Merge pull request #98 from NREL/WeatherFilePath
Browse files Browse the repository at this point in the history
Fix weather file path issue for E+ install runs, bump to 1.9.8
  • Loading branch information
Myoldmopar authored Feb 22, 2023
2 parents 9793dad + 8952569 commit e24dda7
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion epregressions/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = '1.9.7'
VERSION = '1.9.8'
2 changes: 1 addition & 1 deletion epregressions/runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ def run_build(self, build_tree):
)
)

epw_path = os.path.join(build_tree['source_dir'], 'weather', self.default_weather_filename)
epw_path = os.path.join(build_tree['weather_dir'], self.default_weather_filename)
if this_entry.epw:
epw_path = os.path.join(build_tree['weather_dir'], this_entry.epw + '.epw')
epw_exists = os.path.exists(epw_path)
Expand Down
16 changes: 8 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# the core dependencies actually needed
pypubsub==4.0.3
beautifulsoup4==4.9.3
pypubsub
beautifulsoup4

# if running with CI, this is needed for talking to s3
boto==2.49.0
boto

# for running tests
coveralls==2.1.2
flake8==3.8.4
nose==1.3.7
coveralls
flake8
nose

# on windows, if you need to rebuild the unit test resource exes, just install pyinstaller and follow the directions in epregressions/tests/resources/README.md
# pyinstaller; platform_system == "Windows"

# to generate documentation
Sphinx==3.2.1
docutils==0.16 # pinning this because it breaks at 0.18
sphinx
docutils # pinning this because it breaks at 0.18

# for packaging
wheel
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
tests_require=['nose'],
keywords='energyplus',
include_package_data=True,
install_requires=['PyPubSub==4.0.3', 'beautifulsoup4==4.9.3'],
install_requires=['PyPubSub', 'beautifulsoup4'],
entry_points={
'console_scripts': [
'eplus_regression_runner=epregressions.runner:main_gui',
Expand Down

0 comments on commit e24dda7

Please sign in to comment.