Updated dependencies and version bump

TorchSpatiotemporal · Nov 18, 2022 · 6335bb5 · 6335bb5
1 parent a65a8f9
commit 6335bb5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 20 deletions.
diff --git a/conda_env.yml b/conda_env.yml
@@ -7,19 +7,18 @@ channels:
 dependencies:
   - python=3.8
   - pytorch>=1.9
-  - pytorch-lightning>=1.5
-  - torchmetrics>=0.7
-  - pyg>=2.0
+  - pytorch-lightning>=1.5,<1.8
+  - torchmetrics>=0.7,<0.11
+  - pyg>=2.0.3
   - pip
   - pip:
       - .
       - einops
       - hydra-core
       - numpy
       - omegaconf
-      - pandas
+      - pandas>=1.4,<1.5
       - scikit-learn
       - scipy
       - tables
-      - test-tube
       - tqdm
diff --git a/requirements.txt b/requirements.txt
@@ -2,12 +2,11 @@ einops
 hydra-core
 numpy
 omegaconf
-pandas
-pytorch_lightning>=1.5
+pandas>=1.4,<1.5
+pytorch_lightning>=1.5,<1.9
 PyYAML
 scikit_learn
 scipy
 tables
-test_tube
-torchmetrics>=0.7
+torchmetrics>=0.7,<0.11
 tqdm
diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-__version__ = '0.1.1'
+__version__ = '0.9.0'
 URL = 'https://github.com/TorchSpatiotemporal/tsl'
 
 with open("README.md", "r") as fh:
@@ -9,14 +9,13 @@
 install_requires = [
     'einops',
     'numpy',
-    'pandas',
-    'pytorch_lightning>=1.5',
+    'pandas>=1.4,<1.5',
+    'pytorch_lightning>=1.5,<1.9',
     'PyYAML',
     'scikit_learn',
     'scipy',
     'tables',
-    'test_tube',
-    'torchmetrics>=0.7',
+    'torchmetrics>=0.7,<0.11',
     'tqdm',
 ]
 
@@ -32,7 +31,7 @@
 
 full_install_requires = plot_requires + experiment_requires + [
     'holidays',
-    'neptune-client>=0.14',
+    'neptune-client>=0.14,<0.17',
     'pytorch_fast_transformers'
 ]
 

diff --git a/tsl/__init__.py b/tsl/__init__.py
@@ -5,9 +5,9 @@
 data = LazyLoader('data', globals(), 'tsl.data')
 datasets = LazyLoader('datasets', globals(), 'tsl.datasets')
 nn = LazyLoader('nn', globals(), 'tsl.nn')
-inference = LazyLoader('inference', globals(), 'tsl.inference')
+engines = LazyLoader('engines', globals(), 'tsl.engines')
 
-__version__ = '0.1.1'
+__version__ = '0.9.0'
 
 epsilon = 5e-8
 config = Config()
@@ -20,5 +20,5 @@
     'data',
     'datasets',
     'nn',
-    'inference'
+    'engines'
 ]
diff --git a/tsl/utils/__init__.py b/tsl/utils/__init__.py
@@ -1,4 +1,3 @@
-from .experiment import TslExperiment
 from .io import (extract_zip,
                  extract_tar,
                  download_url,
@@ -10,4 +9,3 @@
                            files_exist,
                            precision_stoi,
                            remove_files)
-from .parser_utils import ArgParser