Update gates

* Use bionic for ussuri build as it's the latest supported
release [0][1].
* Switch to centos 8 to run master [1][2].
* Switch default base image to ubuntu:focal.

[0] https://governance.openstack.org/tc/reference/runtimes/ussuri.html
[1] https://governance.openstack.org/tc/reference/runtimes/victoria.html
[2] https://governance.openstack.org/tc/reference/runtimes/train.html

Change-Id: I9a70aebd9636e170c6e04398356933668a2bfbba
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
This commit is contained in:
Andrii Ostapenko
2021-10-12 05:21:05 +00:00
committed by Andrii Ostapenko
parent 68c3d9177f
commit a61c73e9b2
6 changed files with 190 additions and 176 deletions

View File

@@ -1,4 +1,4 @@
ARG FROM=ubuntu:bionic ARG FROM=ubuntu:focal
FROM ${FROM} FROM ${FROM}
ENV PATH=/var/lib/openstack/bin:$PATH ENV PATH=/var/lib/openstack/bin:$PATH

View File

@@ -1,160 +1,162 @@
apache2 [platform:dpkg platform:suse apache] apache2 [platform:dpkg platform:suse apache]
apache2-mod_wsgi [platform:suse apache !python3] apache2-mod_wsgi [platform:suse apache !python3]
apache2-mod_wsgi-python3 [platform:suse apache python3] apache2-mod_wsgi-python3 [platform:suse apache python3]
blas-devel [platform:rpm requirements] blas-devel [platform:rpm requirements]
bridge-utils [(neutron linuxbridge) (nova linuxbridge)] bridge-utils [(neutron linuxbridge) (nova linuxbridge)]
build-essential [platform:dpkg requirements] build-essential [platform:dpkg requirements]
bzip2 [platform:rpm requirements] bzip2 [platform:rpm requirements]
ceph-common [(ceph cinder) (ceph glance) (ceph nova) (ceph manila)] ceph-common [(ceph cinder) (ceph glance) (ceph nova) (ceph manila)]
conntrack [platform:dpkg neutron] conntrack [platform:dpkg neutron]
conntrack-tools [platform:rpm neutron] conntrack-tools [platform:rpm neutron]
cyrus-sasl-devel [platform:rpm requirements] cyrus-sasl-devel [platform:rpm requirements]
device-mapper-multipath [platform:rpm !platform:suse (cinder purestorage) (nova purestorage)] device-mapper-multipath [platform:rpm !platform:suse (cinder purestorage) (nova purestorage)]
dhclient [platform:rpm !platform:suse octavia] dhclient [platform:rpm !platform:suse octavia]
dhcp-client [platform:suse octavia] dhcp-client [platform:suse octavia]
dnsmasq [neutron] dnsmasq [neutron]
dnsmasq-utils [neutron] dnsmasq-utils [neutron]
ebtables [neutron] ebtables [neutron]
erlang-base-hipe [!platform:suse (infra rabbitmq hipe)] erlang-base-hipe [!platform:suse (infra rabbitmq hipe)]
gcc [platform:rpm requirements] gcc [platform:rpm requirements]
gcc-c++ [platform:rpm requirements] gcc-c++ [platform:rpm requirements]
genisoimage [!platform:suse (nova configdrive)] genisoimage [!platform:suse (nova configdrive)]
gettext [horizon] gettext [horizon]
git [requirements] git [requirements]
haproxy [neutron (infra haproxy)] haproxy [neutron (infra haproxy)]
httpd [platform:rpm apache] httpd [platform:rpm apache]
ipmitool [(ironic ipmi)] ipmitool [(ironic ipmi)]
iproute2 [platform:dpkg platform:suse neutron nova (infra libvirt)] iproute2 [platform:dpkg platform:suse neutron nova (infra libvirt)]
ipset [neutron] ipset [neutron]
iptables [neutron (nova linuxbridge)] iptables [neutron (nova linuxbridge)]
iputils [platform:suse neutron] iputils [platform:suse neutron]
iputils-arping [platform:dpkg neutron] iputils-arping [platform:dpkg neutron]
ipxe [platform:dpkg (ironic ipxe)] ipxe [platform:dpkg (ironic ipxe)]
ipxe-bootimgs [platform:rpm (ironic ipxe)] ipxe-bootimgs [platform:rpm (ironic ipxe)]
isc-dhcp-client [platform:dpkg octavia] isc-dhcp-client [platform:dpkg octavia]
iscsi-initiator-utils [platform:rpm !platform:suse (cinder purestorage) (nova purestorage)] iscsi-initiator-utils [platform:rpm !platform:suse (cinder purestorage) (nova purestorage)]
keepalived [neutron (infra keepalived)] keepalived [neutron (infra keepalived)]
krb5-devel [platform:suse requirements] krb5-devel [platform:suse requirements]
kvm [platform:rpm !platform:suse (infra libvirt)] kvm [platform:rpm !platform:suse (infra libvirt)]
kvm_server [platform:suse (infra libvirt)] kvm_server [platform:suse (infra libvirt)]
kvm_tools [platform:suse (infra libvirt)] kvm_tools [platform:suse (infra libvirt)]
lapack-devel [platform:rpm requirements] lapack-devel [platform:rpm requirements]
libapache2-mod-auth-mellon [platform:dpkg (keystone apache mellon)] libapache2-mod-auth-mellon [platform:dpkg (keystone apache mellon)]
libapache2-mod-auth-openidc [platform:dpkg (keystone apache openidc)] libapache2-mod-auth-openidc [platform:dpkg (keystone apache openidc)]
libapache2-mod-wsgi [platform:dpkg (apache !python3)] libapache2-mod-wsgi [platform:dpkg (apache !python3)]
libapache2-mod-wsgi-py3 [platform:dpkg (apache python3)] libapache2-mod-wsgi-py3 [platform:dpkg (apache python3)]
libblas-dev [platform:dpkg requirements] libblas-dev [platform:dpkg requirements]
liberasurecode-dev [platform:dpkg requirements] liberasurecode-dev [platform:dpkg requirements]
liberasurecode-devel [platform:rpm requirements] liberasurecode-devel [platform:rpm requirements]
libffi-dev [platform:dpkg requirements] libffi-dev [platform:dpkg requirements]
libffi-devel [platform:rpm requirements] libffi-devel [platform:rpm requirements]
libgcrypt [platform:rpm !platform:suse requirements] libgcrypt [platform:rpm !platform:suse requirements]
libgcrypt-devel [platform:suse requirements] libgcrypt-devel [platform:suse requirements]
libgcrypt20 [platform:suse requirements] libgcrypt20 [platform:suse requirements]
libiscsi8 [platform:suse (cinder purestorage) (nova purestorage)] libiscsi8 [platform:suse (cinder purestorage) (nova purestorage)]
libjpeg-dev [platform:dpkg requirements] libjpeg-dev [platform:dpkg requirements]
libjpeg-devel [platform:rpm !platform:suse requirements] libjpeg-devel [platform:rpm !platform:suse requirements]
libjpeg8-devel [platform:suse requirements] libjpeg8-devel [platform:suse requirements]
libkrb5-dev [platform:dpkg requirements] libkrb5-dev [platform:dpkg requirements]
liblapack-dev [platform:dpkg requirements] liblapack-dev [platform:dpkg requirements]
libldap-2.4-2 [platform:dpkg (keystone ldap !python3)] libldap-2.4-2 [platform:dpkg (keystone ldap !python3)]
libldap-2_4-2 [platform:suse (keystone ldap !python3)] libldap-2_4-2 [platform:suse (keystone ldap !python3)]
libldap2-dev [platform:dpkg requirements] libldap2-dev [platform:dpkg requirements]
libmariadb-devel [platform:suse requirements] libmariadb-devel [platform:suse requirements]
libmariadbclient-dev [platform:debian requirements] libmariadbclient-dev [platform:debian requirements]
libmysqlclient-dev [platform:ubuntu requirements] libmysqlclient-dev [platform:ubuntu requirements]
libnss3-dev [platform:dpkg requirements] libnss3-dev [platform:dpkg requirements]
libopenssl-devel [platform:suse requirements] libopenssl-devel [platform:suse requirements]
libosinfo [platform:rpm nova] libosinfo [platform:rpm nova]
libosinfo-bin [platform:dpkg nova] libosinfo-bin [platform:dpkg nova]
libpcre3-dev [platform:dpkg requirements] libpcre3-dev [platform:dpkg requirements]
libpq-dev [platform:dpkg requirements] libpq-dev [platform:dpkg requirements]
# libpythonx.y installation logic is moved to scripts to be able to dynamically # libpythonx.y installation logic is moved to scripts to be able to dynamically
# determine minor version from default python installed in a system. # determine minor version from default python installed in a system.
librbd1 [platform:suse (glance ceph !python3)] librbd1 [platform:suse (glance ceph !python3)]
librdkafka-dev [platform:dpkg requirements] librdkafka-dev [platform:dpkg requirements]
libsasl2-dev [platform:dpkg requirements] libsasl2-dev [platform:dpkg requirements]
libssl-dev [platform:dpkg requirements] libssl-dev [platform:dpkg requirements]
libsystemd-dev [platform:dpkg requirements] libsystemd-dev [platform:dpkg requirements]
libvirt [platform:rpm (infra libvirt)] libvirt [platform:rpm (infra libvirt)]
libvirt-bin [platform:dpkg (infra libvirt)] libvirt-bin [platform:dpkg (infra libvirt)]
libvirt-dev [platform:dpkg requirements] libvirt-dev [platform:dpkg requirements]
libvirt-devel [platform:rpm requirements] libvirt-devel [platform:rpm requirements]
libvirt0 [platform:dpkg nova] libvirt0 [platform:dpkg nova]
libxml2 [] libxml2 []
libxml2-dev [platform:dpkg requirements] libxml2-dev [platform:dpkg requirements]
libxml2-devel [platform:rpm requirements] libxml2-devel [platform:rpm requirements]
libxslt-devel [platform:rpm requirements] libxslt-devel [platform:rpm requirements]
libxslt1-dev [platform:dpkg requirements] libxslt1-dev [platform:dpkg requirements]
libyaml-dev [platform:dpkg requirements] libyaml-dev [platform:dpkg requirements]
libyaml-devel [platform:rpm requirements] libyaml-devel [platform:rpm requirements]
libz-dev [platform:dpkg requirements] libz-dev [platform:dpkg requirements]
libzip-devel [platform:suse requirements] libzip-devel [platform:suse requirements]
lvm2 [(cinder lvm) (manila lvm)] lvm2 [(cinder lvm) (manila lvm)]
make [platform:rpm requirements] make [platform:rpm requirements]
mariadb-devel [platform:rpm !platform:suse requirements] mariadb-devel [platform:rpm !platform:suse requirements]
memcached [(infra memcached)] memcached [(infra memcached)]
mkisofs [platform:suse (nova configdrive)] mkisofs [platform:suse (nova configdrive)]
mod_auth_mellon [platform:rpm (keystone apache mellon)] mod_auth_mellon [platform:rpm (keystone apache mellon)]
mod_auth_openidc [platform:rpm (keystone apache openidc)] mod_auth_openidc [platform:rpm (keystone apache openidc)]
mod_ssl [platform:rpm !platform:suse apache] mod_ssl [platform:rpm !platform:suse apache]
mod_wsgi [platform:rpm apache] mod_wsgi [platform:rpm apache]
mozilla-nss-devel [platform:suse requirements] # latest nss-devel breaks python-nss on leap15
multipath-tools [platform:dpkg platform:suse (cinder purestorage) (nova purestorage)] mozilla-nss-devel-3.53.1-lp152.2.7.1 [platform:suse requirements]
mysql [platform:rpm placement] multipath-tools [platform:dpkg platform:suse (cinder purestorage) (nova purestorage)]
mysql-client [platform:dpkg placement] mysql [platform:rpm placement]
nginx [nginx] mysql-client [platform:dpkg placement]
nss-devel [platform:rpm !platform:suse requirements] nginx [nginx]
nss-util [platform:rpm !platform:suse requirements] # latest nss-devel breaks python-nss on centos:8
open-iscsi [platform:dpkg platform:suse (cinder purestorage) (nova purestorage)] nss-devel-3.53.1-17.el8_3 [platform:rpm !platform:suse requirements]
openldap [platform:rpm !platform:suse (keystone ldap !python3)] nss-util [platform:rpm !platform:suse requirements]
openldap-devel [platform:rpm !platform:suse requirements] open-iscsi [platform:dpkg platform:suse (cinder purestorage) (nova purestorage)]
openldap2 [platform:suse (keystone ldap !python3)] openldap [platform:rpm !platform:suse (keystone ldap !python3)]
openldap2-devel [platform:suse requirements] openldap-devel [platform:rpm !platform:suse requirements]
openssh [platform:suse (nova migration)] openldap2 [platform:suse (keystone ldap !python3)]
openssh-client [platform:dpkg (nova migration)] openldap2-devel [platform:suse requirements]
openssh-clients [platform:rpm !platform:suse (nova migration)] openssh [platform:suse (nova migration)]
openssl [platform:suse apache] openssh-client [platform:dpkg (nova migration)]
openssl-devel [platform:rpm !platform:suse requirements] openssh-clients [platform:rpm !platform:suse (nova migration)]
openvswitch [platform:rpm (neutron openvswitch) (nova openvswitch) (infra openvswitch)] openssl [platform:suse apache]
openvswitch-switch [platform:dpkg (neutron openvswitch) (nova openvswitch) (infra openvswitch)] openssl-devel [platform:rpm !platform:suse requirements]
ossp-uuid [platform:suse neutron] openvswitch [platform:rpm (neutron openvswitch) (nova openvswitch) (infra openvswitch)]
pcre-devel [platform:rpm requirements] openvswitch-switch [platform:dpkg (neutron openvswitch) (nova openvswitch) (infra openvswitch)]
pkg-config [platform:dpkg platform:suse requirements] ossp-uuid [platform:suse neutron]
pkgconfig [platform:rpm !platform:suse requirements] pcre-devel [platform:rpm requirements]
postgresql-devel [platform:rpm !platform:suse requirements] pkg-config [platform:dpkg platform:suse requirements]
postgresql-server-devel [platform:suse requirements] pkgconfig [platform:rpm !platform:suse requirements]
python-dev [platform:dpkg (requirements !python3)] postgresql-devel [platform:rpm !platform:suse requirements]
python-devel [platform:rpm (requirements !python3)] postgresql-server-devel [platform:suse requirements]
python-mysql [platform:rpm (monasca api)] python-dev [platform:dpkg (requirements !python3)]
python-mysqldb [platform:dpkg (monasca api !python3)] python-devel [platform:rpm (requirements !python3)]
python-rbd [!platform:suse (glance ceph !python3) (cinder ceph !python3) (manila ceph !python3) (nova ceph !python3)] python-mysql [platform:rpm (monasca api)]
python2-libvirt-python [platform:suse (nova !python3)] python-mysqldb [platform:dpkg (monasca api !python3)]
python3-dev [platform:dpkg (requirements python3)] python-rbd [!platform:suse (glance ceph !python3) (cinder ceph !python3) (manila ceph !python3) (nova ceph !python3)]
python3-devel [platform:rpm (requirements python3)] python2-libvirt-python [platform:suse (nova !python3)]
python3-libvirt-python [platform:suse (nova python3)] python3-dev [platform:dpkg (requirements python3)]
python3-mysqldb [platform:dpkg (monasca api python3)] python3-devel [platform:rpm (requirements python3)]
python3-rados [platform:dpkg (glance ceph python3) (cinder ceph python3) (manila ceph python3) (nova ceph python3)] python3-libvirt-python [platform:suse (nova python3)]
python3-rados [platform:suse (glance ceph python3) (cinder ceph python3) (manila ceph python3) (nova ceph python3)] python3-mysqldb [platform:dpkg (monasca api python3)]
python3-rbd [!platform:suse (glance ceph python3) (cinder ceph python3) (manila ceph python3) (nova ceph python3)] python3-rados [platform:dpkg (glance ceph python3) (cinder ceph python3) (manila ceph python3) (nova ceph python3)]
python3-testsuite [platform:suse python3] python3-rados [platform:suse (glance ceph python3) (cinder ceph python3) (manila ceph python3) (nova ceph python3)]
qemu [platform:dpkg (infra libvirt)] python3-rbd [!platform:suse (glance ceph python3) (cinder ceph python3) (manila ceph python3) (nova ceph python3)]
qemu-img [platform:rpm !platform:suse (nova qemu) (ironic qemu) (cinder qemu) (glance qemu)] python3-testsuite [platform:suse python3]
qemu-tools [platform:suse (nova qemu) (ironic qemu) (cinder qemu) (glance qemu)] qemu [platform:dpkg (infra libvirt)]
qemu-utils [platform:dpkg (nova qemu) (ironic qemu) (cinder qemu) (glance qemu)] qemu-img [platform:rpm !platform:suse (nova qemu) (ironic qemu) (cinder qemu) (glance qemu)]
rabbitmq-server [(infra rabbitmq)] qemu-tools [platform:suse (nova qemu) (ironic qemu) (cinder qemu) (glance qemu)]
sg3-utils [platform:dpkg (cinder purestorage) (nova purestorage)] qemu-utils [platform:dpkg (nova qemu) (ironic qemu) (cinder qemu) (glance qemu)]
sg3_utils [platform:rpm (cinder purestorage) (nova purestorage)] rabbitmq-server [(infra rabbitmq)]
syslinux-tftpboot [platform:rpm !platform:suse (ironic tftp)] sg3-utils [platform:dpkg (cinder purestorage) (nova purestorage)]
systemd-devel [platform:rpm requirements] sg3_utils [platform:rpm (cinder purestorage) (nova purestorage)]
targetcli [platform:rpm (cinder lvm)] syslinux-tftpboot [platform:rpm !platform:suse (ironic tftp)]
tftp [platform:suse (ironic tftp)] systemd-devel [platform:rpm requirements]
tftp-server [platform:rpm !platform:suse (ironic tftp)] targetcli [platform:rpm (cinder lvm)]
tftpboot-installation-common [platform:suse (ironic tftp)] tftp [platform:suse (ironic tftp)]
tftpd-hpa [platform:dpkg (ironic tftp)] tftp-server [platform:rpm !platform:suse (ironic tftp)]
tgt [platform:dpkg platform:suse (cinder lvm)] tftpboot-installation-common [platform:suse (ironic tftp)]
thin-provisioning-tools [platform:dpkg platform:suse (cinder lvm)] tftpd-hpa [platform:dpkg (ironic tftp)]
uuid [platform:rpm !platform:suse neutron] tgt [platform:dpkg platform:suse (cinder lvm)]
uuid-devel [platform:suse neutron] thin-provisioning-tools [platform:dpkg platform:suse (cinder lvm)]
uuid-runtime [platform:dpkg neutron] uuid [platform:rpm !platform:suse neutron]
zlib-devel [platform:rpm requirements] uuid-devel [platform:suse neutron]
uuid-runtime [platform:dpkg neutron]
zlib-devel [platform:rpm requirements]

View File

@@ -1,23 +1,29 @@
[base] [appstream]
name=CentOS-$releasever - Base name=CentOS Linux $releasever - AppStream
baseurl=http://%%PACKAGE_MIRROR%%/centos/$releasever/os/$basearch/ baseurl=http://%%PACKAGE_MIRROR%%/$contentdir/$releasever/AppStream/$basearch/os/
gpgcheck=1 gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
[updates] [baseos]
name=CentOS-$releasever - Updates name=CentOS Linux $releasever - BaseOS
baseurl=http://%%PACKAGE_MIRROR%%/centos/$releasever/updates/$basearch/ baseurl=http://%%PACKAGE_MIRROR%%/$contentdir/$releasever/BaseOS/$basearch/os/
gpgcheck=1 gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
[extras] [extras]
name=CentOS-$releasever - Extras name=CentOS Linux $releasever - Extras
baseurl=http://%%PACKAGE_MIRROR%%/centos/$releasever/extras/$basearch/ baseurl=http://%%PACKAGE_MIRROR%%/$contentdir/$releasever/extras/$basearch/os/
gpgcheck=1 gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
[powertools]
name=CentOS Linux $releasever - PowerTools
baseurl=http://%%PACKAGE_MIRROR%%/$contentdir/$releasever/PowerTools/$basearch/os/
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
[openstack] [openstack]
name=CentOS-$releasever - OpenStack name=CentOS-$releasever - OpenStack
baseurl=http://%%PACKAGE_MIRROR%%/centos/\$releasever/cloud/$basearch/openstack-stein/ baseurl=http://%%PACKAGE_MIRROR%%/centos/$releasever/cloud/$basearch/openstack-victoria/
gpgcheck=1 gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud

View File

@@ -1,4 +1,4 @@
ARG FROM=centos:7 ARG FROM=centos:8
FROM ${FROM} FROM ${FROM}
ARG PACKAGE_MIRROR=mirror.centos.org ARG PACKAGE_MIRROR=mirror.centos.org
@@ -11,5 +11,6 @@ RUN rm -rf /etc/yum.repos.d/*
COPY CentOS.repo /etc/yum.repos.d/ COPY CentOS.repo /etc/yum.repos.d/
COPY RPM-GPG-KEY-CentOS-SIG-Cloud /etc/pki/rpm-gpg/ COPY RPM-GPG-KEY-CentOS-SIG-Cloud /etc/pki/rpm-gpg/
RUN sed -i "s|%%PACKAGE_MIRROR%%|${PACKAGE_MIRROR}|g" /etc/yum.repos.d/CentOS.repo \ RUN sed -i "s|%%PACKAGE_MIRROR%%|${PACKAGE_MIRROR}|g" /etc/yum.repos.d/CentOS.repo \
&& yum install -y centos-release-qemu-ev \
&& yum update -y && yum update -y
# NOTE(aostapenko) repositories are restored on yum update, deleting them again
RUN find /etc/yum.repos.d/ -type f ! -name 'CentOS.repo' -delete

View File

@@ -20,7 +20,7 @@ loci_src_dir: "src/opendev.org/openstack/loci"
distros: distros:
- name: centos - name: centos
image: centos:7 image: centos:8
release: master release: master
buildargs: buildargs:
base: base:
@@ -62,7 +62,7 @@ distros:
PYTHON3: yes PYTHON3: yes
- name: ubuntu_bionic - name: ubuntu_bionic
image: ubuntu:bionic image: ubuntu:bionic
release: master release: ussuri
buildargs: buildargs:
base: base:
UBUNTU_URL: http://{{ zuul_site_mirror_fqdn }}/ubuntu/ UBUNTU_URL: http://{{ zuul_site_mirror_fqdn }}/ubuntu/
@@ -74,7 +74,7 @@ distros:
project: project:
PROJECT: "{{ project }}" PROJECT: "{{ project }}"
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }} PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
WHEELS: 172.17.0.1:5000/loci/requirements:master-ubuntu_bionic WHEELS: 172.17.0.1:5000/loci/requirements:ussuri-ubuntu_bionic
FROM: base:ubuntu_bionic FROM: base:ubuntu_bionic
PYTHON3: yes PYTHON3: yes
requirements: requirements:

View File

@@ -23,6 +23,11 @@ fi
# anymore # anymore
sed -i '/python-qpid-proton===0.14.0/d' /upper-constraints.txt sed -i '/python-qpid-proton===0.14.0/d' /upper-constraints.txt
# Setuptools from constraints is not compatible with other constrainted packages
[[ "${PROJECT_REF}" == "master" ]] && sed -i '/setuptools/d' /upper-constraints.txt
# https://review.opendev.org/c/openstack/requirements/+/813693
[[ "${PYTHON3}" != "no" ]] && sed -i '/^futures===/d' /upper-constraints.txt
# Remove trollius 2.1 because of multiple problems: # Remove trollius 2.1 because of multiple problems:
# - It is not published on pypi anymore (only 2.1.post2 is) # - It is not published on pypi anymore (only 2.1.post2 is)
# - Trollius is a py2 only software, and the current requirement from # - Trollius is a py2 only software, and the current requirement from