Skip to content

Commit

Permalink
Fix reqs (#11)
Browse files Browse the repository at this point in the history
* update reqs

* PySide2 version

* PySide2==5.15.2.1

* pyside2

* scipy

* test reqs

* update reqs

* test

* formatting

---------

Co-authored-by: Mojtaba Sardarmehni <msa75@ascendanalytics.com>
  • Loading branch information
msm-sardar and Mojtaba Sardarmehni authored Aug 18, 2023
1 parent 02e0cff commit f6d4803
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@ on:
jobs:
build-linux:
runs-on: ubuntu-latest
strategy:
max-parallel: 5

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: "3.9"
python-version: 3.9

- name: Add conda to system path
run: |
Expand All @@ -29,6 +27,7 @@ jobs:
- name: Install dependencies
run: |
conda update conda
conda env update --file environment_dev.yml --name base
- name: Check if feature branch exists in swolfpy-inputdata
Expand Down
2 changes: 1 addition & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
History
=======

1.1.0 (2023-07-30)
1.2.0 (2023-07-30)
------------------

* Downgrade to Python 3.9
Expand Down
13 changes: 8 additions & 5 deletions environment_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channels:
- cmutel
- haasad
dependencies:
- pip
- python=3.9
- pip:
- brightway2==2.4.1
- bw-migrations==0.1
Expand All @@ -16,13 +16,16 @@ dependencies:
- bw2parameters==1.1.0
- coverage
- graphviz
- jupyter
- pandas==2.0.*
- numpy==1.24.*
- plotly
- pyDOE
- PySide2==5.15.*
- PySide2==5.15.2.1
- pytest
- pytest-cov
- pytest-flake8
- scipy==1.8.0
- scipy==1.9.0
- swolfpy_inputdata==1.1.*
- swolfpy_processmodels==1.1.*
- xlrd==1.2.0
- pandas==2.0.*
- numpy==1.24.*
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ pandas==2.0.*
numpy==1.24.*
plotly
pyDOE
PySide2==5.15.*
PySide2==5.15.2.1
pytest
pytest-cov
pytest-flake8
scipy==1.8.0
swolfpy_inputdata==1.0.*
swolfpy_processmodels==1.0.*
scipy==1.9.0
swolfpy_inputdata==1.1.*
swolfpy_processmodels==1.1.*
xlrd==1.2.0
2 changes: 1 addition & 1 deletion swolfpy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"swolfpy",
]

__version__ = "1.1.0"
__version__ = "1.2.0"


class swolfpy:
Expand Down

0 comments on commit f6d4803

Please sign in to comment.