Merge branch 'master' of github.com:pulp/pulp_python

Author: CodeHeeler

.travis.yml

@@ -1,3 +1,10 @@
+# WARNING: DO NOT EDIT!
+#
+# This file was generated by plugin_template, and is managed by bootstrap.py. Please use
+# bootstrap.py to update this file.
+#
+# For more info visit https://github.com/pulp/plugin_template
+
 sudo: required
 # https://docs.travis-ci.com/user/trusty-ci-environment/
 dist: xenial
@@ -10,29 +17,23 @@ env:
   matrix:
     - DB=postgres TEST=pulp
     - DB=postgres TEST=docs
-    - DB=mariadb TEST=pulp
 
 
 matrix:
   exclude:
-    - python: '3.6'
-      env: DB=mariadb TEST=pulp
-
     - python: '3.6'
       env: DB=postgres TEST=docs
   fast_finish: true
 services:
     - postgresql
     - redis-server
-    - mariadb
 addons:
   apt:
     packages:
       - httpie
       - jq
   # postgres versions provided by el7 RHSCL (lowest supportable version)
   postgresql: '9.6'
-  mariadb: '10.3'
 before_install: .travis/before_install.sh
 install: .travis/install.sh
 before_script: .travis/before_script.sh
@@ -71,3 +72,6 @@ jobs:
       - DB=postgres
       - TEST=bindings
     if: tag IS present
+
+notifications: None
+

.travis/before_install.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 # WARNING: DO NOT EDIT!
 #
@@ -7,7 +7,7 @@
 #
 # For more info visit https://github.com/pulp/plugin_template
 
-set -v
+set -mveuo pipefail
 
 export PRE_BEFORE_INSTALL=$TRAVIS_BUILD_DIR/.travis/pre_before_install.sh
 export POST_BEFORE_INSTALL=$TRAVIS_BUILD_DIR/.travis/post_before_install.sh
@@ -31,61 +31,53 @@ pip install -r test_requirements.txt
 # check the commit message
 ./.travis/check_commit.sh
 
+
+
 # Lint code.
-flake8 --config flake8.cfg || exit 1
+flake8 --config flake8.cfg
 
 cd ..
-git clone https://github.com/pulp/ansible-pulp.git
+git clone --depth=1 https://github.com/pulp/ansible-pulp.git
 if [ -n "$PULP_ROLES_PR_NUMBER" ]; then
-  pushd ansible-pulp
-  git fetch origin +refs/pull/$PULP_ROLES_PR_NUMBER/merge
+  cd ansible-pulp
+  git fetch --depth=1 origin +refs/pull/$PULP_ROLES_PR_NUMBER/merge
   git checkout FETCH_HEAD
-  popd
+  cd ..
 fi
 
-git clone https://github.com/pulp/pulpcore.git
+git clone --depth=1 https://github.com/pulp/pulpcore.git
 
 if [ -n "$PULP_PR_NUMBER" ]; then
-  pushd pulpcore
-  git fetch origin +refs/pull/$PULP_PR_NUMBER/merge
+  cd pulpcore
+  git fetch --depth=1 origin +refs/pull/$PULP_PR_NUMBER/merge
   git checkout FETCH_HEAD
-  popd
+  cd ..
 fi
 
 
-git clone https://github.com/pulp/pulpcore-plugin.git
+git clone --depth=1 https://github.com/pulp/pulpcore-plugin.git
 
 if [ -n "$PULP_PLUGIN_PR_NUMBER" ]; then
-  pushd pulpcore-plugin
-  git fetch origin +refs/pull/$PULP_PLUGIN_PR_NUMBER/merge
+  cd pulpcore-plugin
+  git fetch --depth=1 origin +refs/pull/$PULP_PLUGIN_PR_NUMBER/merge
   git checkout FETCH_HEAD
-  popd
+  cd ..
 fi
 
 
 if [ -n "$PULP_SMASH_PR_NUMBER" ]; then
-  git clone https://github.com/PulpQE/pulp-smash.git
-  pushd pulp-smash
-  git fetch origin +refs/pull/$PULP_SMASH_PR_NUMBER/merge
+  git clone --depth=1 https://github.com/PulpQE/pulp-smash.git
+  cd pulp-smash
+  git fetch --depth=1 origin +refs/pull/$PULP_SMASH_PR_NUMBER/merge
   git checkout FETCH_HEAD
-  popd
+  cd ..
 fi
 
-if [ "$DB" = 'mariadb' ]; then
-  # working around https://travis-ci.community/t/mariadb-build-error-with-xenial/3160
-  mysql -u root -e "DROP USER IF EXISTS 'travis'@'%';"
-  mysql -u root -e "CREATE USER 'travis'@'%';"
-  mysql -u root -e "CREATE DATABASE pulp;"
-  mysql -u root -e "ALTER DATABASE pulp CHARACTER SET utf8;"
-  mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'travis'@'%';";
-else
-  psql -c 'CREATE DATABASE pulp OWNER travis;'
-fi
+psql -c 'CREATE DATABASE pulp OWNER travis;'
 
 pip install ansible
 cp pulp_python/.travis/playbook.yml ansible-pulp/playbook.yml
 cp pulp_python/.travis/postgres.yml ansible-pulp/postgres.yml
-cp pulp_python/.travis/mariadb.yml ansible-pulp/mariadb.yml
 
 cd pulp_python
 

.travis/playbook.yml

@@ -12,8 +12,8 @@
       include_vars: '{{ pulp_db_type }}.yml'
   vars:
     pulp_default_admin_password: admin
-    pulp_source_dir: '/home/travis/build/pulp/pulpcore/'
-    pulp_plugin_source_dir: "/home/travis/build/pulp/pulpcore-plugin"
+    pulp_source_dir: '{{ ansible_env.TRAVIS_BUILD_DIR | dirname }}/pulpcore/'
+    pulp_plugin_source_dir: "{{ ansible_env.TRAVIS_BUILD_DIR | dirname }}/pulpcore-plugin"
     pulp_install_plugins:
       pulp-python:
         app_label: "python"

.travis/publish_client_pypi.sh

@@ -12,7 +12,7 @@ pip install twine
 django-admin runserver 24817 >> ~/django_runserver.log 2>&1 &
 sleep 5
 
-cd /home/travis/build/pulp/pulp_python/
+cd "${TRAVIS_BUILD_DIR}"
 export REPORTED_VERSION=$(http :24817/pulp/api/v3/status/ | jq --arg plugin pulp_python -r '.versions[] | select(.component == $plugin) | .version')
 export DESCRIPTION="$(git describe --all --exact-match `git rev-parse HEAD`)"
 if [[ $DESCRIPTION == 'tags/'$REPORTED_VERSION ]]; then

.travis/script.sh

@@ -25,7 +25,7 @@ wait_for_pulp() {
     echo -n .
     sleep 1
     TIMEOUT=$(($TIMEOUT - 1))
-    if [ $(http :24817/pulp/api/v3/status/ | jq '.database_connection.connected and .redis_connection.connected') = 'true' ]
+    if [ "$(http :24817/pulp/api/v3/status/ 2>/dev/null | jq '.database_connection.connected and .redis_connection.connected')" = "true" ]
     then
       echo
       return

.travis/validate_commit_message.py

@@ -10,22 +10,24 @@
 import subprocess
 import sys
 
-KEYWORDS = ['fixes', 'closes', 're', 'ref']
-NO_ISSUE = '[noissue]'
-STATUSES = ['NEW', 'ASSIGNED', 'POST']
+KEYWORDS = ["fixes", "closes", "re", "ref"]
+NO_ISSUE = "[noissue]"
+STATUSES = ["NEW", "ASSIGNED", "POST"]
 
 sha = sys.argv[1]
-message = subprocess.check_output(['git', 'log', '--format=%B', '-n 1', sha]).decode('utf-8')
+message = subprocess.check_output(["git", "log", "--format=%B", "-n 1", sha]).decode("utf-8")
 
 
 def __check_status(issue):
-    response = requests.get('https://pulp.plan.io/issues/{}.json'.format(issue))
+    response = requests.get("https://pulp.plan.io/issues/{}.json".format(issue))
     response.raise_for_status()
     bug_json = response.json()
-    status = bug_json['issue']['status']['name']
+    status = bug_json["issue"]["status"]["name"]
     if status not in STATUSES:
-        sys.exit("Error: issue #{issue} has invalid status of {status}. Status must be one of "
-                 "{statuses}.".format(issue=issue, status=status, statuses=", ".join(STATUSES)))
+        sys.exit(
+            "Error: issue #{issue} has invalid status of {status}. Status must be one of "
+            "{statuses}.".format(issue=issue, status=status, statuses=", ".join(STATUSES))
+        )
 
 
 print("Checking commit message for {sha}.".format(sha=sha[0:7]))
@@ -34,7 +36,7 @@ def __check_status(issue):
 if NO_ISSUE in message:
     print("Commit {sha} has no issue attached. Skipping issue check".format(sha=sha[0:7]))
 else:
-    regex = r'(?:{keywords})[\s:]+#(\d+)'.format(keywords=('|').join(KEYWORDS))
+    regex = r"(?:{keywords})[\s:]+#(\d+)".format(keywords=("|").join(KEYWORDS))
     pattern = re.compile(regex)
 
     issues = pattern.findall(message)
@@ -43,7 +45,9 @@ def __check_status(issue):
         for issue in pattern.findall(message):
             __check_status(issue)
     else:
-        sys.exit("Error: no attached issues found for {sha}. If this was intentional, add "
-                 " '{tag}' to the commit message.".format(sha=sha[0:7], tag=NO_ISSUE))
+        sys.exit(
+            "Error: no attached issues found for {sha}. If this was intentional, add "
+            " '{tag}' to the commit message.".format(sha=sha[0:7], tag=NO_ISSUE)
+        )
 
 print("Commit message for {sha} passed.".format(sha=sha[0:7]))

CHANGES/4990.feature

@@ -0,0 +1 @@
+Override the Remote's serializer to allow policy='on_demand' and policy='streamed'.

pulp_python/app/serializers.py

@@ -4,6 +4,7 @@
 from packaging import specifiers
 from rest_framework import serializers
 
+from pulpcore.plugin import models as core_models
 from pulpcore.plugin import serializers as core_serializers
 
 from pulp_python.app import models as python_models
@@ -252,6 +253,12 @@ class PythonRemoteSerializer(core_serializers.RemoteSerializer):
         required=False,
         help_text=_('Whether or not to include pre-release packages in the sync.')
     )
+    policy = serializers.ChoiceField(
+        help_text=_("The policy to use when downloading content. The possible values include: "
+                    "'immediate', 'on_demand', and 'cache_only'. 'immediate' is the default."),
+        choices=core_models.Remote.POLICY_CHOICES,
+        default=core_models.Remote.IMMEDIATE
+    )
 
     class Meta:
         fields = core_serializers.RemoteSerializer.Meta.fields + (

pulp_python/tests/functional/api/test_crud_remotes.py

@@ -3,6 +3,7 @@
 
 from requests.exceptions import HTTPError
 from pulp_smash import api, config, utils
+from pulp_smash.pulp3.constants import ON_DEMAND_DOWNLOAD_POLICIES
 
 from pulp_python.tests.functional.constants import (
     PYTHON_REMOTE_PATH,
@@ -150,8 +151,8 @@ def _gen_verbose_remote():
     attrs = gen_python_remote()
     attrs.update({
         'password': utils.uuid4(),
+        'policy': random.choice(ON_DEMAND_DOWNLOAD_POLICIES),
         'username': utils.uuid4(),
-        'validate': random.choice((False, True)),
     })
     return attrs
 

template_config.yml

@@ -0,0 +1,27 @@
+# This config represents the latest values used when running the plugin-template. Any settings that
+# were not present before running plugin-template have been added with their default values.
+
+plugin_name: pulp_python
+plugin_app_label: python
+plugin_snake: pulp_python
+plugin_caps: PULP_PYTHON
+plugin_caps_short: PYTHON
+plugin_camel: PulpPython
+plugin_camel_short: Python
+plugin_dash: pulp-python
+plugin_dash_short: python
+black: False
+check_commit_message: True
+coverage: False
+deploy_client_to_pypi: True
+deploy_client_to_rubygems: True
+deploy_daily_client_to_pypi: True
+deploy_daily_client_to_rubygems: True
+deploy_to_pypi: True
+docs_test: True
+pydocstyle: True
+test_bindings: False
+pypi_username: pulp
+travis_notifications: None
+
+