Skip to content

Commit

Permalink
Merge pull request #230 from WenjieDu/dev
Browse files Browse the repository at this point in the history
Update version limitations on dependencies, and install dependencies in PyPI publishing workflow
  • Loading branch information
WenjieDu authored Nov 6, 2023
2 parents 7577570 + 6f1c998 commit 78f6e64
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/publish_to_PyPI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install build
pip install build wheel
pip install -r requirements.txt
- name: Fetch the test environment details
run: |
Expand All @@ -47,7 +48,7 @@ jobs:
- name: Build package
run: |
python -m build
python -m build --no-isolation
- name: Publish the new package to PyPI
uses: pypa/gh-action-pypi-publish@v1.8.6
Expand Down
4 changes: 2 additions & 2 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dependencies:
#- conda-forge::pandas <2.0.0
#- conda-forge::h5py
#- conda-forge::tensorboard
#- conda-forge::pygrinder
#- conda-forge::tsdb
#- conda-forge::pygrinder >=0.2
#- conda-forge::tsdb >=0.2
#- pytorch::pytorch >=1.10.0
## Below we install the latest pypots because we need pypots-cli in it for development.
## PyPOTS itself already includes all basic dependencies.
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ scipy
torch>=1.10.0
tensorboard
pandas<2.0.0
pygrinder
tsdb
pygrinder>=0.2
tsdb>=0.2
h5py
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ basic =
tensorboard
scipy
h5py
tsdb
pygrinder
tsdb>=0.2
pygrinder>=0.2

# dependencies that are optional, torch-geometric are only needed for model Raindrop
# but its installation takes too much time
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
"torch>=1.10.0",
"tensorboard",
"pandas<2.0.0",
"pygrinder",
"tsdb",
"pygrinder>=0.2",
"tsdb>=0.2",
"h5py",
],
python_requires=">=3.7.0",
Expand Down
4 changes: 2 additions & 2 deletions tests/environment_for_conda_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dependencies:
- conda-forge::pandas <2.0.0
- conda-forge::h5py
- conda-forge::tensorboard
- conda-forge::pygrinder
- conda-forge::tsdb
- conda-forge::pygrinder >=0.2
- conda-forge::tsdb >=0.2
- conda-forge::protobuf <=4.21.12
- pytorch::pytorch >=1.10.0

Expand Down

0 comments on commit 78f6e64

Please sign in to comment.