Browse Source

change the dist name to 'openstack-heat'

We are updating all Python projects to publish artifacts to PyPI. The
name "heat" is already taken there by another project, and they have
rejected our request to claim the name. We therefore need to change the
dist name used to package heat. We have some other projects publishing
using an "openstack-" prefix, so I propose using the name
"openstack-heat". This will not change the imports or anything else
about how the code works, just how it is packaged.

Add a grenade plugin for upgrading between the packages with different
names so that we can clean up the old version of the code and avoid
discovering the heat plugins multiple times in different locations.

Change-Id: I59b55cffd9e648f842eb286b936f09c5b55a76db
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
changes/60/606160/23
Doug Hellmann 3 years ago
parent
commit
8ae5f8657b
  1. 55
      devstack/upgrade/from-rocky/upgrade-heat
  2. 2
      heat/version.py
  3. 7
      releasenotes/notes/change-dist-name-288024b5d6668c01.yaml
  4. 2
      setup.cfg
  5. 2
      tox.ini

55
devstack/upgrade/from-rocky/upgrade-heat

@ -0,0 +1,55 @@
#!/usr/bin/env bash
# ``upgrade-heat``
function configure_heat_upgrade {
local xtrace
xtrace=$(set +o | grep xtrace)
set -o xtrace
# The dist name for heat changed in rocky from "heat" to
# "openstack-heat". Having the metadata for both packages
# installed causes our plugins to be listed twice, so we need to
# remove the old one before devstack installs the new one.
# Using pip to uninstall the old code doesn't seem to work,
# so this script works a bit more aggressively. These steps
# should not be necessary for deployments using standard
# system packages from distributions.
local python_interpreter="python"
if python3_enabled; then
python_interpreter="python3"
fi
local sys_path=$($python_interpreter -c 'import sys; print(" ".join(sys.path))')
local sys_path_dir
local egg_link
local easy_file
for sys_path_dir in $sys_path; do
# Installing something in editable mode creates an "egg link"
# file that points to the location of the source files and
# metadata. When we do the upgrades for projects that preserve
# their name, the existing file is modified to point to the
# new location. In this case, heat's name is changing so we
# end up with a new file using the new name and the old one is
# untouched. We need to remove it ourselves.
egg_link="$sys_path_dir/heat.egg-link"
if [ -e "$egg_link" ]; then
sudo rm -f "$egg_link"
fi
# Installing a directory in editable mode adds the directory
# to the .pth file that setuptools manages. When we do the
# upgrades for projects that preserve their name, the old
# entry is automatically replaced with the new one. In this
# case, heat's name is changing, so setuptools doesn't figure
# out that it should remove the old entry, and we have to do
# it ourselves.
easy_file=$sys_path_dir/easy-install.pth
if [ -f $easy_file ]; then
sudo sed --in-place '/old\/heat/d' $easy_file
fi
done
## reset to previous state
$xtrace
}

2
heat/version.py

@ -14,4 +14,4 @@
import pbr.version
version_info = pbr.version.VersionInfo('heat')
version_info = pbr.version.VersionInfo('openstack-heat')

7
releasenotes/notes/change-dist-name-288024b5d6668c01.yaml

@ -0,0 +1,7 @@
---
upgrade:
- |
The distribution name has been changed from "heat" to
"openstack-heat" so that we can publish packages to pypi.org. This
may have an effect on downstream package builds if they rely on
asking setuptools to determine the package name.

2
setup.cfg

@ -1,5 +1,5 @@
[metadata]
name = heat
name = openstack-heat
summary = OpenStack Orchestration
description-file =
README.rst

2
tox.ini

@ -118,7 +118,7 @@ max-complexity=20
[doc8]
ignore = D001
ignore-path = .venv,.git,.tox,.tmp,*heat/locale*,*lib/python*,heat.egg*,doc/build,releasenotes/*
ignore-path = .venv,.git,.tox,.tmp,*heat/locale*,*lib/python*,openstack_heat.egg*,doc/build,releasenotes/*
[hacking]
import_exceptions = heat.common.i18n

Loading…
Cancel
Save