Merge pull request #696 from mv1388/revert-695-move_package_to_python…

…_3_9

Revert "Move package from python 3.6 to python 3.9"

.github/workflows/package_testing.yml

@@ -10,7 +10,7 @@ jobs:
       max-parallel: 4
       matrix:
         os: [ubuntu-18.04, macos-latest]
-        python-version: [3.9]
+        python-version: [3.8]
 
     steps:
     - uses: actions/checkout@v1
@@ -22,7 +22,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install 'moto[all]' pytest
+        pip install 'six>=1.13.0'
+        pip install 'moto[all]==1.3.14' pytest
         pip install tensorflow keras
         pip install -r requirements.txt
 

.github/workflows/publish_testpypi_pypi.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@master
-      - name: Set up Python 3.9
+      - name: Set up Python 3.8
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: 3.8
 
       - name: Install dependencies
         run: |

.travis.yml

@@ -5,7 +5,7 @@ matrix:
     - name: "Ubuntu 18.04 - Python 3.8"
       os: linux
       dist: bionic  # Ubuntu 18.04
-      python: 3.9
+      python: 3.8
 #    - name: "Ubuntu 18.04 - Python 3.7"
 #      os: linux
 #      dist: bionic  # Ubuntu 18.04
@@ -27,7 +27,9 @@ matrix:
 
 # command to install dependencies
 install:
-  - pip install 'moto[all]' pytest
+  - pip install setuptools==41.0.0
+  - pip install 'six>=1.13.0'
+  - pip install 'moto[all]==1.3.14' pytest
   - pip install tensorflow keras
   - pip install -r requirements.txt
 

readthedocs.yml

@@ -20,7 +20,7 @@ formats: all
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.8
+  version: 3.6
   install:
     - requirements: requirements.txt
     - requirements: docs/docs_requirements.txt

requirements.txt

@@ -1,13 +1,13 @@
-torch
-torchvision
-torchtext
-pytorch-nlp
-transformers
 numpy
 pandas
 scikit-learn
 matplotlib
 seaborn
+torch>=1.6.0
+torchvision
+torchtext==0.7
+pytorch-nlp
+transformers
 joblib
 tqdm
 awscli

setup.py

@@ -13,23 +13,23 @@
     license='MIT',
     keywords=['PyTorch', 'deep learning', 'research', 'train loop'],
 
-    python_requires='>=3.9.0',
+    python_requires='>=3.6.0',
 
     packages=find_packages(exclude=['tests', 'tests_gpu', 'examples', 'deprecated']),
 
     install_requires=[
-        'torch',
-        'torchvision',
-        'torchtext',
-        'pytorch-nlp',
-        'transformers',
-
         'numpy',
         'pandas',
         'scikit-learn',
         'matplotlib',
         'seaborn',
 
+        'torch>=1.6.0',
+        'torchvision',
+        'torchtext==0.7',
+        'pytorch-nlp',
+        'transformers',
+
         'joblib',
         'tqdm',
         'awscli',
@@ -57,6 +57,7 @@
         'Topic :: Scientific/Engineering :: Artificial Intelligence',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.9'
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7'
     ]
 )

tests/test_cloud/test_AWS/test_data_access.py

@@ -15,7 +15,7 @@
 class TestBaseDataSaver(unittest.TestCase):
     @mock_s3
     def test_data_upload(self):
-        s3 = boto3.resource('s3', region_name='us-east-1')
+        s3 = boto3.resource('s3')
         s3.create_bucket(Bucket=BUCKET_NAME)
         s3_client = boto3.client('s3')
 
@@ -31,7 +31,7 @@ def test_data_upload(self):
 
     @mock_s3
     def test_data_upload_content(self):
-        s3 = boto3.resource('s3', region_name='us-east-1')
+        s3 = boto3.resource('s3')
         s3.create_bucket(Bucket=BUCKET_NAME)
 
         data_saver = BaseDataSaver(bucket_name=BUCKET_NAME)
@@ -53,7 +53,7 @@ def test_data_upload_content(self):
 
     @mock_s3
     def test_folder_upload(self):
-        s3 = boto3.resource('s3', region_name='us-east-1')
+        s3 = boto3.resource('s3')
         s3.create_bucket(Bucket=BUCKET_NAME)
         s3_client = boto3.client('s3')
 
@@ -78,7 +78,7 @@ def test_folder_upload(self):
 class TestBaseDataLoader(unittest.TestCase):
     @mock_s3
     def test_data_download(self):
-        s3 = boto3.resource('s3', region_name='us-east-1')
+        s3 = boto3.resource('s3')
         s3.create_bucket(Bucket=BUCKET_NAME)
         s3_client = boto3.client('s3')
         s3_client.upload_file(os.path.join(THIS_DIR, 'resources/file.txt'), BUCKET_NAME, 'file.txt')

tests/test_torchtrain/test_train_loop/test_e2e_train_loop/test_end2end_train_loop_tracking.py

@@ -411,7 +411,7 @@ def check_loaded_representation(self, model_representation, optimizer, scheduler
 
     @mock_s3
     def test_e2e_ff_net_train_loop_cloud_save(self):
-        s3 = boto3.resource('s3', region_name='us-east-1')
+        s3 = boto3.resource('s3')
         s3.create_bucket(Bucket=BUCKET_NAME)
         s3_client = boto3.client('s3')
 
@@ -686,7 +686,7 @@ def test_e2e_ff_net_train_loop_tracking_saved_files_check(self):
 
     @mock_s3
     def test_e2e_ff_net_train_loop_cloud_save(self):
-        s3 = boto3.resource('s3', region_name='us-east-1')
+        s3 = boto3.resource('s3')
         s3.create_bucket(Bucket=BUCKET_NAME)
         s3_client = boto3.client('s3')
 
@@ -785,7 +785,7 @@ def test_e2e_ff_net_train_loop_iteration_model_checkpointing(self):
 
     @mock_s3
     def test_e2e_ff_net_train_loop_iteration_model_checkpointing_cloud_save(self):
-        s3 = boto3.resource('s3', region_name='us-east-1')
+        s3 = boto3.resource('s3')
         s3.create_bucket(Bucket=BUCKET_NAME)
         s3_client = boto3.client('s3')
 
@@ -1102,7 +1102,7 @@ def test_e2e_ff_net_train_loop_tracking_saved_files_check(self):
 
     @mock_s3
     def test_e2e_ff_net_train_loop_cloud_save(self):
-        s3 = boto3.resource('s3', region_name='us-east-1')
+        s3 = boto3.resource('s3')
         s3.create_bucket(Bucket=BUCKET_NAME)
         s3_client = boto3.client('s3')