Merge branch 'main' of https://github.com/WenjieDu/PyPOTS

WenjieDu · Nov 6, 2023 · 939ad55 · 939ad55
2 parents 9d4d498 + 78f6e64
commit 939ad55
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/publish_to_PyPI.yml b/.github/workflows/publish_to_PyPI.yml
@@ -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: |
@@ -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/[email protected]

diff --git a/environment-dev.yml b/environment-dev.yml
@@ -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.

diff --git a/requirements.txt b/requirements.txt
@@ -7,6 +7,6 @@ scipy
 torch>=1.10.0
 tensorboard
 pandas<2.0.0
-pygrinder
-tsdb
+pygrinder>=0.2
+tsdb>=0.2
 h5py
diff --git a/setup.cfg b/setup.cfg
@@ -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

diff --git a/setup.py b/setup.py
@@ -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",

diff --git a/tests/environment_for_conda_test.yml b/tests/environment_for_conda_test.yml
@@ -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