Skip to content

Commit

Permalink
Merge pull request #46 from EPAENERGYSTAR/feature/epa2.0_tau_experime…
Browse files Browse the repository at this point in the history
…nts_pathlib_fixed_tests

Feature/epa2.0 tau experiments pathlib fixed tests
  • Loading branch information
john-zither authored Jan 9, 2024
2 parents e27ce5f + 51418d7 commit 96d3cc7
Show file tree
Hide file tree
Showing 9 changed files with 178 additions and 114 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
# Apparently 3.10 gets converted to 3.1 if it's not a string. Brilliant.
python-version: [3.8, 3.9, '3.10', '3.11']
python-version: [3.8]

steps:
- uses: actions/checkout@v2
Expand Down
28 changes: 13 additions & 15 deletions .github/workflows/windows_conda_testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,30 @@ jobs:

build:
runs-on: windows-latest
strategy:
matrix:
# Apparently 3.10 gets converted to 3.1 if it's not a string. Brilliant.
python-version: [3.8]


steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
- name: Install dependencies
run: |
C:\Miniconda\condabin\conda.bat env update --file environment.yml --name base
C:\Miniconda\condabin\conda.bat init powershell
- name: Lint with flake8
run: |
# Activate the base environment
C:\Miniconda\condabin\conda.bat activate base
C:\Miniconda\condabin\conda.bat install flake8
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
python-version: 3.8
- name: Test with pytest
run: |
# Activate the base environment
python --version
C:\Miniconda\condabin\conda.bat activate base
python --version
C:\Miniconda\condabin\conda.bat install pytest pytest-cov coverage mock pip
python --version
C:\Miniconda\condabin\conda.bat install -c conda-forge shapely
python --version
pip install --upgrade pip
pip install -r requirements.txt
pytest
pip install -r dev-requirements.txt
pytest --cov-report=term-missing --cov=thermostat
69 changes: 69 additions & 0 deletions requirements.conda.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# pip-compile requirements.txt
#
certifi==2021.5.30
# via
# -r requirements.txt
# pyproj
# requests
charset-normalizer==2.0.4
# via
# -r requirements.txt
# requests
click==8.0.1
# via
# -r requirements.txt
# eeweather
eeweather==0.3.24
# via -r requirements.txt
greenlet==1.1.1
# via
# -r requirements.txt
# sqlalchemy
idna==3.2
# via
# -r requirements.txt
# requests
numpy==1.21.0
# via
# -r requirements.txt
# pandas
# scipy
pandas==1.5.2
# via
# -r requirements.txt
# eeweather
python-dateutil==2.8.2
# via
# -r requirements.txt
# pandas
pytz==2021.1
# via
# -r requirements.txt
# pandas
requests==2.26.0
# via
# -r requirements.txt
# eeweather
scipy==1.11.1
# via -r requirements.txt
shapely==1.7.1
# via
# -r requirements.txt
# eeweather
six==1.16.0
# via
# -r requirements.txt
# python-dateutil
sqlalchemy==1.4.22
# via -r requirements.txt
urllib3==1.26.6
# via
# -r requirements.txt
# requests
zipcodes==1.2.0
# via -r requirements.txt
loguru==0.7.2
9 changes: 3 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ idna==3.2
# via
# -r requirements.txt
# requests
numpy==1.21.2
numpy==1.22.4
# via
# -r requirements.txt
# pandas
Expand All @@ -36,10 +36,6 @@ pandas==1.5.2
# via
# -r requirements.txt
# eeweather
pyproj==3.1.0
# via
# -r requirements.txt
# eeweather
python-dateutil==2.8.2
# via
# -r requirements.txt
Expand Down Expand Up @@ -69,4 +65,5 @@ urllib3==1.26.6
# -r requirements.txt
# requests
zipcodes==1.2.0
# via -r requirements.txt
# via -r requirements.txt
loguru==0.7.2
Loading

0 comments on commit 96d3cc7

Please sign in to comment.