pulp · bmbouter · Oct 6, 2015 · Jun 15, 2015
diff --git a/devel/pulp_puppet/__init__.py b/devel/pulp_puppet/__init__.py
@@ -1,15 +1,2 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 from pkgutil import extend_path
 __path__ = extend_path(__path__, __name__)
diff --git a/devel/pulp_puppet/devel/__init__.py b/devel/pulp_puppet/devel/__init__.py
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.

diff --git a/devel/pulp_puppet/devel/base_cli.py b/devel/pulp_puppet/devel/base_cli.py
@@ -1,16 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2012 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 import copy
 import logging
 import os.path

diff --git a/docs/user-guide/release-notes/2.8.x.rst b/docs/user-guide/release-notes/2.8.x.rst
@@ -0,0 +1,21 @@
+=============================
+Pulp Puppet 2.8 Release Notes
+=============================
+
+Pulp Puppet 2.8.0
+=================
+
+New Features
+------------
+
+- This release drops the following three indexes using a database migration which runs as part of
+  the `pulp-manage-db` command:
+   - `tag_list`
+   - `name_1_version_1_author_1`
+   - `author`
+- This release also adds an index for `author_1_name_1_version_1`
+
+Bugs Fixed
+----------
+
+You can see the :fixedbugs:`list of bugs fixed<2.8.0>`.
diff --git a/docs/user-guide/release-notes/index.rst b/docs/user-guide/release-notes/index.rst
@@ -6,6 +6,7 @@ Contents:
 .. toctree::
    :maxdepth: 2
 
+   2.8.x
    2.7.x
    2.6.x
    2.5.x

diff --git a/manage_setup_pys.sh b/manage_setup_pys.sh
@@ -1,16 +1,4 @@
 #!/usr/bin/env bash
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 
 # Use this bash script to run argument 1 on each setup.py in this project
 

diff --git a/pulp-dev.py b/pulp-dev.py
@@ -33,8 +33,6 @@
     ('pulp_puppet_plugins/etc/httpd/conf.d/pulp_puppet.conf', '/etc/httpd/conf.d/pulp_puppet.conf'),
     ('pulp_puppet_plugins/etc/pulp/vhosts80/puppet.conf', '/etc/pulp/vhosts80/puppet.conf'),
     ('pulp_puppet_plugins/srv/pulp/puppet_forge.wsgi', '/srv/pulp/puppet_forge.wsgi'),
-    # Puppet Support Plugins
-    ('pulp_puppet_plugins/pulp_puppet/plugins/types/puppet.json', DIR_PLUGINS + '/types/puppet.json'),
     # Puppet Support Admin Extensions
     ('pulp_puppet_extensions_admin/etc/pulp/admin/conf.d/puppet.conf', '/etc/pulp/admin/conf.d/puppet.conf'),
     # handlers

diff --git a/pulp-puppet.spec b/pulp-puppet.spec
@@ -95,16 +95,13 @@ popd
 
 mkdir -p %{buildroot}/%{_sysconfdir}/pulp/vhosts80
 mkdir -p %{buildroot}/srv/pulp
-mkdir -p %{buildroot}/%{_usr}/lib/pulp/plugins/types
 mkdir -p %{buildroot}/%{_var}/lib/pulp/published/puppet/http
 mkdir -p %{buildroot}/%{_var}/lib/pulp/published/puppet/https
 
 cp -R pulp_puppet_plugins/etc/httpd %{buildroot}/%{_sysconfdir}
 cp pulp_puppet_plugins/etc/pulp/vhosts80/puppet.conf %{buildroot}/%{_sysconfdir}/pulp/vhosts80/
 # WSGI app
 cp -R pulp_puppet_plugins/srv/pulp/puppet_forge.wsgi %{buildroot}/srv/pulp/
-# Types
-cp -R pulp_puppet_plugins/pulp_puppet/plugins/types/* %{buildroot}/%{_usr}/lib/pulp/plugins/types/
 %endif # End pulp_server if block
 
 pushd pulp_puppet_handlers
@@ -181,7 +178,6 @@ to provide Puppet specific support.
 %{python_sitelib}/pulp_puppet/forge/
 %{python_sitelib}/pulp_puppet/plugins/
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/pulp_puppet.conf
-%{_usr}/lib/pulp/plugins/types/puppet.json
 %{python_sitelib}/pulp_puppet_plugins*.egg-info
 /srv/pulp/puppet_forge.wsgi
 

diff --git a/pulp_puppet_common/pulp_puppet/common/__init__.py b/pulp_puppet_common/pulp_puppet/common/__init__.py
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2012 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.

diff --git a/pulp_puppet_common/pulp_puppet/common/constants.py b/pulp_puppet_common/pulp_puppet/common/constants.py
@@ -1,27 +1,14 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2012 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 """
 Contains constants that are global across the entire puppet plugin. Eventually,
 this will be pulled into a common dependency across all of the puppet
 support plugins (importers, distributors, extensions).
 """
 
-# -- ids ----------------------------------------------------------------------
-
-# ID used to refer to the puppet importer
 import os
 
+
+# -- ids ----------------------------------------------------------------------
+
 IMPORTER_TYPE_ID = 'puppet_importer'
 
 # ID used to refer to the puppet importer instance on a repository
@@ -49,7 +36,7 @@
 TYPE_PUPPET_MODULE = 'puppet_module'
 
 # Used as a note on a repository to indicate it is a Puppet repository
-REPO_NOTE_KEY = '_repo-type' # needs to be standard across extensions
+REPO_NOTE_KEY = '_repo-type'  # needs to be standard across extensions
 REPO_NOTE_PUPPET = 'puppet-repo'
 
 # -- storage and hosting ------------------------------------------------------
@@ -162,7 +149,7 @@
 # as its value that should be used for the request
 SKIP_DEP_OPTION = 'skip_dep'
 
-# Option key passed to an "install", "update" or uninstall consumer request with a modulepath 
+# Option key passed to an "install", "update" or uninstall consumer request with a modulepath
 # as its value that should be used for the request
 MODULEPATH_OPTION = 'module_path'