Merge ade1436 into 684a7a4

.github/workflows/qiita-ci.yml

@@ -167,14 +167,17 @@ jobs:
           conda deactivate
 
           echo "8. Setting up SSH"
-          ssh-keygen -t rsa-sha2-256 -b 4096 -N '' -f $PWD/qiita_ware/test/test_data/test_key
+          ssh-keygen -t rsa -b 4096 -N '' -f $PWD/qiita_ware/test/test_data/test_key
           mkdir ~/.ssh/
           cp $PWD/qiita_ware/test/test_data/test_key* ~/.ssh/
           cat ~/.ssh/test_key.pub > ~/.ssh/authorized_keys
           chmod 600 $PWD/qiita_ware/test/test_data/test_key*
           chmod 600 ~/.ssh/*
           chmod 700 ~/.ssh/
-          scp -o StrictHostKeyChecking=no -i $PWD/qiita_ware/test/test_data/test_key $USER@localhost:$PWD/qiita_ware/test/test_data/random_key $PWD/qiita_ware/test/test_data/random_key_copy
+          echo "Connecting as $USER@localhost"
+          # this line (and the -o StrictHostKeyChecking=no) is so the server
+          # is added to the list of known servers
+          scp -o StrictHostKeyChecking=no -i $PWD/qiita_ware/test/test_data/test_key $USER@localhost:/home/runner/work/qiita/qiita/qiita_ware/test/test_data/random_key /home/runner/work/qiita/qiita/qiita_ware/test/test_data/random_key_copy_1
 
       - name: Main tests
         shell: bash -l {0}

qiita_pet/support_files/doc/source/faq.rst

@@ -371,6 +371,16 @@ specially on:
   Qiita will not be able to process your samples.
 
 
+Software and Data Licensing
+---------------------------
+
+Qiita's software and its plugins can be found here: https://github.com/qiita-spots/. They are
+distributed with a BSD 3-Clause License. When you use the `Qiita WebServer <https://qiita.ucsd.edu/>`__,
+you are adhering to the `Qiita Terms <https://qiita.ucsd.edu/iframe/?iframe=qiita-terms>`__. All data
+downloaded from `qiita.ucsd.edu <https://qiita.ucsd.edu/>` and redbiom, including raw and processed data
+and metadata, are distributed under the BSD 3-Clause License.
+
+
 How to cite Qiita?
 ------------------
 

qiita_ware/commands.py

@@ -54,15 +54,17 @@ def _ssh_session(p_url, private_key):
 
         # step 1: both schemes require an SSH connection
         ssh = SSHClient()
+        ssh.load_system_host_keys()
         ssh.set_missing_host_key_policy(AutoAddPolicy)
 
         # step 2: connect to fileserver
         key = RSAKey.from_private_key_file(private_key)
-        # we need pkeys now based on
-        # https://github.com/paramiko/paramiko/issues/1961
-        pkeys = dict(pubkeys=['rsa-sha2-256', 'rsa-sha2-512'])
+        print('++++++++++++++++')
+        print('++++++++++++++++')
+        print(f'{hostname}, {port}, {username}')
+        print('++++++++++++++++')
         ssh.connect(hostname, port=port, username=username,
-                    pkey=key, look_for_keys=False, disabled_algorithms=pkeys)
+                    pkey=key, look_for_keys=False)
         return ssh
     else:
         raise ValueError(

qiita_ware/test/test_commands.py

@@ -64,6 +64,11 @@ def test_list_scp_nonexist_key(self):
     def test_list_scp(self):
         kpath = join(self.temp_local_dir, 'tmp-key')
         copyfile(self.test_ssh_key, kpath)
+        print('==========')
+        print('==========')
+        print(self.test_ssh_key, kpath)
+        print('scp://runner@localhost:' + self.remote_dir_path)
+        print('==========')
         read_file_list = list_remote(
             'scp://runner@localhost:'+self.remote_dir_path, kpath)
         self.assertCountEqual(read_file_list, self.exp_files)

setup.py

@@ -108,7 +108,7 @@
                         'networkx', 'humanize', 'wtforms<3.0.0', 'nltk',
                         'openpyxl', 'sphinx-bootstrap-theme', 'Sphinx<3.0',
                         'gitpython', 'redbiom', 'pyzmq', 'sphinx_rtd_theme',
-                        'paramiko<2.9', 'seaborn',  'matplotlib', 'scipy<1.8',
+                        'paramiko', 'seaborn',  'matplotlib', 'scipy<1.8',
                         'nose',
                         'flake8', 'six', 'qiita-files @ https://github.com/'
                         'qiita-spots/qiita-files/archive/master.zip', 'mock',