Code

Fix dependency conflicts#4774

Code

Merged

blag merged 13 commits intomasterStackStorm/st2:masterfrom backoff-requirementsStackStorm/st2:backoff-requirementsCopy head branch name to clipboardAug 23, 2019

+222-20

Commits

Commits on Aug 21, 2019

• Betterize header message

  blag

  committed
  b4667e0

  Copy full SHA for b4667e0

• Update to amqp 2.5.1

  blag

  committed
  f8117cd

  Copy full SHA for f8117cd

• Allow pyyaml > 5.0

  blag

  committed
  e18fe26

  Copy full SHA for e18fe26

• Update prance to 0.15.0

  blag

  committed
  97e8b2b

  Copy full SHA for 97e8b2b

• Downgrade requests to <2.22.0 to match prance requirements

  blag

  committed
  8977bcd

  Copy full SHA for 8977bcd

• Update six to 1.12.0

  blag

  committed
  cdb7dbd

  Copy full SHA for cdb7dbd

• Don't uninstall python-dateutil if we aren't on Travis

  blag

  committed
  60c2d63

  Copy full SHA for 60c2d63

• Update headers on dist_utils.py files

  blag

  committed
  8edd7bd

  Copy full SHA for 8edd7bd

• Betterize requirements header

  blag

  committed
  f3bbc15

  Copy full SHA for f3bbc15

• Update all requirements files with the new (better) header

  blag

  committed
  4a0e8a1

  Copy full SHA for 4a0e8a1

Commits on Aug 22, 2019

• [skip ci] Add changelog entries

  blag

  committed
  62c67ba

  Copy full SHA for 62c67ba

• Tweak changelog to kick CI

  blag

  committed
  7c3a73d

  Copy full SHA for 7c3a73d

• Make changelog ordering consistent

  blag

  committed
  b702eca

  Copy full SHA for b702eca