Release 3.3.5

CONTRIBUTING.rst

@@ -320,6 +320,11 @@ Create an admin user
 From the root of the project tree, run ``make dev/createsuperuser`` to start
 the creation process. You'll be prompted for the vital details as depicted below:
 
+.. note:: Do **NOT** create an admin user with the same email account as any GitHub
+          accounts you wish to use to login to your local galaxy. Doing so will
+          prevent galaxy from adding any GitHub accounts with the same email as the
+          admin account.
+
 .. code-block:: console
 
     $ make dev/createsuperuser

galaxy/constants.py

@@ -23,7 +23,7 @@
 
 
 MAX_TAGS_COUNT = 20
-MAX_UPLOAD_FILE_SIZE_BYTES = 2 * 1000 * 1000  # 2MB
+MAX_UPLOAD_FILE_SIZE_BYTES = 20 * 1000 * 1000  # 20MB
 PROVIDER_GITHUB = 'GitHub'
 ROLE_TAG_REGEXP = re.compile(r'^[a-z0-9]+$')
 NAME_REGEXP = re.compile(r'^(?!.*__)[a-z]+[0-9a-z_]*$')

galaxy/importer/finders.py

@@ -136,9 +136,11 @@ def _find_roles(self, content_type, content_dir):
             if not os.path.isdir(file_path):
                 continue
             meta_path = _find_metadata(file_path, ROLE_META_FILES)
-            if not meta_path:
-                raise exc.RoleMetadataNotFound('Role metadata not found')
             rel_path = os.path.relpath(file_path, self.path)
+            if not meta_path:
+                raise exc.RoleMetadataNotFound(
+                    'Role metadata not found in directory: "{0}"'.format(
+                        rel_path))
             yield Result(content_type, rel_path,
                          extra={'metadata_path': meta_path})
 

galaxy/importer/utils/readme.py

@@ -93,7 +93,7 @@ def render_html(readme_file):
         # https://github.com/Python-Markdown/markdown/issues/225
         html = bleach.clean(
             unsafe_html,
-            tags=markdown_tags + ['pre'],
+            tags=markdown_tags + ['pre', 'table', 'thead', 'th', 'tr', 'td'],
             attributes=markdown_attrs,
             styles=[],
             strip=True

galaxyui/src/styles.less

@@ -207,6 +207,17 @@ a.failed {
             height: 100%;
         }
     }
+
+    .readme table {
+        tr:nth-child(2n) {
+            background-color: #f2f2f2;
+        }
+        td,
+        th {
+            border: 1px solid #ccc;
+            padding: 5px;
+        }
+    }
 }
 
 /* Authors */

requirements/dev-requirements.txt

@@ -7,7 +7,7 @@
 aiohttp==3.5.4
 alabaster==0.7.12         # via sphinx
 amqp==1.4.9               # via kombu
-ansible-lint==4.1.0
+ansible-lint==4.2.0
 ansible==2.7.12
 anyjson==0.3.3            # via kombu
 asn1crypto==0.24.0        # via cryptography

requirements/requirements.txt

@@ -7,7 +7,7 @@
 aiohttp==3.5.4
 alabaster==0.7.12         # via sphinx
 amqp==1.4.9               # via kombu
-ansible-lint==4.1.0
+ansible-lint==4.2.0
 ansible==2.7.12
 anyjson==0.3.3            # via kombu
 asn1crypto==0.24.0        # via cryptography

scripts/docker/release/entrypoint.sh

@@ -5,6 +5,8 @@ set -o errexit
 
 readonly GALAXY_VENV=${GALAXY_VENV:-/usr/share/galaxy/venv}
 readonly GALAXY_NUM_WORKERS=${GALAXY_NUM_WORKERS:-1}
+readonly GUNICORN_MAX_REQUESTS="${GUNICORN_MAX_REQUESTS:-4000}"
+readonly GUNICORN_MAX_REQUESTS_JITTER="${GUNICORN_MAX_REQUESTS_JITTER:-200}"
 
 # shellcheck disable=SC2034
 VIRTUAL_ENV_DISABLE_PROMPT=1
@@ -22,6 +24,8 @@ run_api() {
     _exec_cmd "${GALAXY_VENV}/bin/gunicorn" \
         --bind 0.0.0.0:8000 \
         --workers "${GALAXY_NUM_WORKERS}" \
+        --max-requests "${GUNICORN_MAX_REQUESTS}" \
+        --max-requests-jitter "${GUNICORN_MAX_REQUESTS_JITTER}" \
         --access-logfile '-' \
         --error-logfile '-' \
         galaxy.wsgi:application