We are jazzed to announce the release of: magnum 10.0.0: Container Management project for OpenStack This release is part of the ussuri release series. The source is available from: https://opendev.org/openstack/magnum Download the package from: https://tarballs.openstack.org/magnum/ Please report issues through: https://bugs.launchpad.net/magnum/+bugs For more details, please see below. 10.0.0 ^^^^^^ Upgrade Notes ************* * The default version of Kubernetes dashboard has been upgraded to v2.0.0 and metrics-server is supported by k8s dashboard now. Bug Fixes ********* * There was a corner case that when floating_ip_enabled=False, master_lb_enabled=True,master_lb_floating_ip_enabled=False in cluster template, but setting floating_ip_enabled=True when creating the cluster, which causes missing IP address in the api_address of cluster. Now the isssue has been fixed. Changes in magnum 9.0.0.0rc1..10.0.0 ------------------------------------ c6e536ae [k8s] Fix docker storage of Fedora CoreOS 45563f37 [k8s] Upgrade k8s dashboard version to v2.0.0 abafef16 Use ensure-* roles f6df6c9a Update TOX_CONSTRAINTS_FILE for stable/ussuri 6175b663 Update .gitreview for stable/ussuri c2f4b9b5 [k8s] Fix no IP address in api_address e8ef675a [k8s-fcos] Bump up default versions to v1.18.x 06659759 [k8s] Introduce helm_client_tag label. 6a376217 Remove nodeSelector for flannel DaemonSet 0732251d [k8s] Expose traefik prometheus metrics 1ea8db94 fcos-kubelet: Add rpc-statd dependency 39ccad9c Build new autoscaler containers 2723d20a fix: Open udp port 53 on master to support CoreDNS 63e80c31 [k8s] Support updating k8s cluster health status dd4b7926 Support calico v3.3.6 7ad3ef18 Cleanup py27 support 4a1c6eb1 fcos: Upgrade default flannel_tag to v0.12.0-amd64 d3984dd4 fcos: Upgrade etcd to v3.4.6, use quay.io/coreos/etcd 4439295a [k8s] Upgrade calico to the latest stable version 076547e1 [k8s] Improve the taint of master node kubelet 9f5203bf [k8s] Upgrade default coreDNS version to 1.6.6 ae228bb5 Update hacking for Python3 fd80e198 Add selinux_mode label 1994e944 fcos: Mount /:/rootfs:ro to Kubelet 529b036e Fix calico regression issue caused by default ipv4pool change fbaba6e0 k8s: Fix logic of when a cluster API is accessible 2864fc57 Use cluster name for fixed_network instead of private dfea2741 Fix join of status_reason d342fc0a Update default calico_ipv4pool f77aba5e Release k8s v1.15.11 image 744fff3a fcos: Disable zincati auto-updates af74b326 k8s-fedora: Set max-size to 10m for containers d1dee1e9 Add node groups documentation 36671643 calico: Add node/status in ClusterRole 2d2bd5d7 atomic-podman: Set log imit to 50m 9d543960 fcos-podman: Set max size for logging to 50m 78435e4f Add fcct config for coreos user_data 3b94cd14 [hca] Restore deploy_{stdout,stderr,status_code} d61dd1d5 [k8s] Support post install manifest URL a4190dc9 Remove buildimage jobs 5ee27cfb Add an ARCH parameter to handle arch specific things 95abb45d [bug] Fix regression when use_podman=false 9565984f Add cinder_csi_enabled label 8108679c [k8s] Make metrics-server work without DNS 69c9b195 [hca] Live log for SoftwareDeployment scripts de21e043 Add opt-in containerd support 642dc759 Fix typo in docs 89e33bdd Fix ingress traefik systemd unit 4eeb7047 bug: Double quote CALICO_IPV4POOL_IPIP value eb2b688f [k8s] Fix instance ID issue with podman and autoscaler 0b5d0291 Upgrade pause image to version 3.1 84803e3f Fix the load balancer description regex pattern for deleting cluster 7da53fe3 k8s_coreos Set REQUESTS_CA for heat-agent e731a7cb core-podman: Mount os-release properly 33560e26 Execute traefik systemd unit over ssh 4ceb3916 Add selector in monitoring deployments 30436350 Fix Field `health_status_reason[api]' cannot be None` 4346d776 Fix proxy for Grafana script 1ecec95b Fix api-cert-manager=true blocking cluster creation 0fab6a70 [k8s] Support docker storage driver for fedora coreos a0e62df0 [k8s] Fix volumes availability zone issue 355c7192 Add calico_ipv4pool_ipip label a943756a Support verifying the digest for hyperkube image 5be1282c Fix duplicated words issue like "meaning meaning that" c681b88f Imported Translations from Zanata b53d9380 Add a link to compatibility matrix for kube_tag c5e65f3f tox: Keeping going with docs ad2ef496 Fix proxy issue for k8s fedora drivers b2393220 [k8s] Fix RBAC for OCCM v1.17.0 7d81ae18 [k8s] Enable services before starting them c37ca0f0 [k8s] Remove indentation in /etc/sysconfig/heat-params 8fa77dae Fix entrypoint for k8s components in podman 05193caa [k8s] Deprecate heapster 36cb3911 Fix heat-container-agent image building error on arm64 df52f9c9 [k8s] Update metrics-server 9e3be39d k8s_fedora: Bump up default kube_tag to v1.15.7 895b693c [fix] Allow cluster OS upgrade without specifying kube_tag 0bf18002 Release k8s v1.14.10 and v1.15.7 e75e28dc Fix nginx getting OOM killed 4eff195c Bump up prometheus operator chart to 8.2.2 a14d0cc0 Make traefik compatible with 1.16.x 82d71cd8 nodegroup list with --limit gives wrong next URL 1ad4a9d0 [k8s] Add heapster_enabled label c8752d69 Increase backoffLimit to 10 for helm installer 35457580 Add prometheus-adapter 612b2277 bug: cluster creation without docker_volume_size a65e0550 PDF documentation build cab9492d [k8s] Fix rolling upgrade with podman 9910925d Change k8s-keystone-auth docker repo 6703cbdd Scrape prometheus metrics from nginx 7d6e344f Add nginx_ingress_controller_chart_tag 26a171f9 bug: Only query Cinder API if volume size > 0 0d39f353 Make it possible to use uwsgi easily 380aa1cf Release k8s v1.14.9 and v1.15.6 0205534f Fix cert_manager_api with x509keypair 735fadf5 Support TimeoutStartSec for etcd and heat agent systemd services b2cc1c23 bug: Use configured heat-container-agent tag 8f2a3249 Use --containerized flag to support 1.{13,14,15}.x in Atomic 3d17c6eb Drop python2 tests 15a4ea14 Support TimeoutStartSec for k8s systemd services dc8acda7 Fix if condition to test for var==true 3f2ca208 coreos: Use heat params for heat-agent image 37c61fa2 Docker volume size from nodegroups aa6b3bbe k8s_fedora: Add use_podman label 23ca0d3c No new NGs for clusters without an api_address 66ebe442 heat-agent: Check if scripts exists 9b4ae2e3 Use v1.15.0 as default octavia_ingress_controller_tag 09f85f37 [fedora-atomic][k8s] Support operating system upgrade 756a85b7 bug: Cluster should be creatable w/o fixed subnet 1b1d8410 Release k8s v1.13.12, v1.14.8, v1.15.5, v1.16.2 0ac4db95 ng-13: Support nodegroup upgrade 113fdc44 ng-12: Label nodegroup nodes f14c5001 ng-11: API microversion 1.9 44631afb ng-10: Fix cluster template conditions 73dc57c3 Support Fedora CoreOS 30 25c0f461 Build cluster autoscaler container images 25496654 update api-ref for clustertemplate ae159882 Failed state was ignored for default ngs 97dbd49d Convert fixed_subnet name to uuid for OCCM 7dc4c7d9 Fixing typos and spelling errors in driver template files 3674b361 k8s_atomic: Run all syscontainer with podman 2f72fdfb Pass ssh public key as string a6ce4ce6 Delete the ca-rotate api-ref 'ca-rotate' hasn't been supported, 'ERROR: 'rotate_ca_certificate' is not supported by this driver (HTTP 400)' will be returned. So, I think we should supply the api after it's realization. c54f86b4 Add wiki Admin guide and Contributing notes link to README bb747ac5 k8s_fedora: Move rp_filter=1 for calico up 9dc92654 k8s_fedora: Label master nodes with kubectl ddf27e93 Add hostname-override to kube-proxy abd9368d Set cniVersion for flannel d224999c Improve log of k8s health status check cd054f20 Change the order of resource creation 23c85bf0 Drop deprecated APIs for kube v1.16 support 77e6e5cf ci: Add output stream fixture to fix CI 60a79510 Update master for stable/train e52f77b2 ng-9: Driver for nodegroup operations 5027e0da ng-8: APIs for nodegroup CRUD operations d4a52719 ng-7: Adapt parameter and output mappings cbe05aa9 ng-6: Add new fields to nodegroup objects 459e27e6 Propagate cloud_provider_enabled correctly 6bb95dac Return default quota from API 11b8fdf6 Fix up installation instructions for openSUSE Diffstat (except docs and test files) ------------------------------------- .gitreview | 1 + .zuul.yaml | 90 +- README.rst | 5 +- api-ref/source/certificates.inc | 26 - api-ref/source/clustertemplates.inc | 6 + api-ref/source/parameters.yaml | 7 + .../dcos_centos_v1/templates/dcoscluster.yaml | 5 + .../scripts/configure_container_agent.sh | 40 +- .../heat-container-agent/scripts/hooks/script | 52 +- .../scripts/write-os-apply-config-templates.sh | 9 +- .../kubernetes-controller-manager/launch.sh | 2 + .../kubernetes-kubelet/config.json.template | 5 +- lower-constraints.txt | 7 +- magnum/api/app.py | 7 + magnum/api/controllers/v1/cluster.py | 49 +- magnum/api/controllers/v1/cluster_actions.py | 10 +- magnum/api/controllers/v1/cluster_template.py | 2 +- magnum/api/controllers/v1/nodegroup.py | 187 ++- magnum/api/controllers/v1/quota.py | 17 +- magnum/api/controllers/v1/types.py | 2 +- magnum/api/controllers/versions.py | 3 +- magnum/api/middleware/auth_token.py | 2 +- magnum/api/utils.py | 3 +- magnum/api/validation.py | 3 +- magnum/cmd/conductor.py | 2 + magnum/common/cert_manager/local_cert_manager.py | 2 +- magnum/common/exception.py | 37 +- magnum/common/neutron.py | 39 +- magnum/common/nova.py | 34 + magnum/common/octavia.py | 2 +- magnum/common/policies/cluster.py | 11 + magnum/common/policies/nodegroup.py | 33 + magnum/common/short_id.py | 3 +- magnum/conductor/api.py | 39 +- magnum/conductor/handlers/cluster_conductor.py | 28 +- magnum/conductor/handlers/common/cert_manager.py | 16 +- magnum/conductor/handlers/nodegroup_conductor.py | 152 ++ magnum/conductor/utils.py | 2 + magnum/conf/kubernetes.py | 6 + magnum/db/api.py | 2 +- .../041d9a0f1159_add_flavor_id_to_cluster.py | 4 +- ...f584_remove_ssh_authorized_key_from_baymodel.py | 2 +- ...04c625aa95ba_change_storage_driver_to_string.py | 4 +- .../versions/05d3e97de9ee_add_volume_driver.py | 8 +- .../versions/085e601a39f6_remove_service.py | 2 +- .../14328d6a57e3_add_master_count_to_bay.py | 4 +- ...f5b560dd_add_labels_column_to_baymodel_table.py | 4 +- .../versions/156ceb17fb0a_add_bay_status_reason.py | 4 +- .../versions/1afee1db6cd0_add_master_flavor.py | 4 +- .../1c1ff5e56048_rename_container_image_id.py | 4 +- .../1d045384b966_add_insecure_baymodel_attr.py | 4 +- .../versions/1f196a3dabae_remove_container.py | 2 +- .../versions/2581ebaf0cb2_initial_migration.py | 8 +- ...304554e2_adding_magnum_service_functionality.py | 4 +- .../29affeaa2bc2_rename_bay_master_address.py | 4 +- .../2ace4006498_rename_bay_minions_address.py | 4 +- ...3c9c6191_add_public_column_to_baymodel_table.py | 4 +- .../versions/2b5f24dd95de_rename_service_port.py | 4 +- .../versions/2d1354bbf76e_ssh_authorized_key.py | 4 +- .../alembic/versions/2d8657c0cdc_add_bay_uuid.py | 4 +- .../33ef79969018_add_memory_to_container.py | 4 +- ...35cff7c86221_add_private_network_to_baymodel.py | 8 +- .../3a938526b35d_add_docker_volume_size.py | 4 +- .../3b6c4c42adb4_add_unique_constraints.py | 2 +- ...65537a94a_add_network_driver_baymodel_column.py | 8 +- .../alembic/versions/3bea56f25597_multi_tenant.py | 4 +- .../40f325033343_add_bay_create_timeout_to_bay.py | 4 +- .../417917e778f5_add_server_type_to_baymodel.py | 4 +- .../421102d1f2d2_create_x509keypair_table.py | 4 +- .../versions/456126c6c9e9_create_baylock_table.py | 4 +- ...98132c7_change_cluster_to_support_nodegroups.py | 12 +- ...380964133d_add_network_subnet_fip_to_cluster.py | 8 +- .../versions/4956f03cabad_add_cluster_distro.py | 8 +- .../versions/4e263f236334_add_registry_enabled.py | 4 +- .../4ea34a59a64c_add_discovery_url_to_bay.py | 8 +- ...52bcaf58fecb_add_master_flavor_id_to_cluster.py | 4 +- .../53882537ac57_add_host_column_to_pod.py | 4 +- .../versions/5518af8dbc21_rename_cert_uuid.py | 8 +- .../versions/5793cd26898d_add_bay_status.py | 4 +- .../versions/57fbdf2327a2_remove_baylock.py | 2 +- .../592131657ca1_add_coe_column_to_baymodel.py | 10 +- .../versions/5977879072a7_add_env_to_container.py | 4 +- .../versions/59e7664a8ba1_add_container_status.py | 4 +- .../versions/5ad410481b88_rename_insecure.py | 4 +- .../5d4caa6e0a42_create_trustee_for_each_bay.py | 8 +- ...d_master_lb_enabled_column_to_baymodel_table.py | 4 +- .../versions/6f21dc920bb_add_cert_uuid_to_bay.py | 4 +- .../6f21dc998bb_add_master_addresses_to_bay.py | 6 +- .../720f640f43d1_rename_bay_table_to_cluster.py | 4 +- .../859fb45df249_remove_replication_controller.py | 2 +- .../87e62e3c7abc_add_hidden_to_cluster_template.py | 4 +- .../alembic/versions/966a99e70ff_add_proxy.py | 8 +- .../versions/9a1539f1cd2c_add_federation_table.py | 6 +- .../versions/a0e7c8450ab1_add_labels_to_cluster.py | 4 +- ...1136d335540_add_docker_storage_driver_column.py | 4 +- ...0cc27839af_add_docker_volume_size_to_cluster.py | 4 +- .../versions/ac92cbae311c_add_nodegoup_table.py | 8 +- .../adc3b7679ae_add_registry_trust_id_to_bay.py | 4 +- ...612248cab_add_floating_ip_enabled_column_to_.py | 4 +- .../versions/bb42b7cad130_remove_node_object.py | 2 +- .../bc46ba6cf949_add_keypair_to_cluster.py | 4 +- .../alembic/versions/c04e925e65c2_nodegroups_v2.py | 50 + .../cbbc65a86986_add_health_status_to_cluster.py | 4 +- .../d072f58ab240_modify_x509keypair_table.py | 4 +- ...71_add_fixed_subnet_column_to_baymodel_table.py | 8 +- ...47f5931da8_add_insecure_registry_to_baymodel.py | 8 +- .../versions/e772b2598d9_add_container_command.py | 4 +- .../versions/ee92b41b8809_create_quotas_table.py | 4 +- .../alembic/versions/ef08a5e057bd_remove_pod.py | 2 +- ...3fdef8919_rename_baymodel_to_clustertemplate.py | 2 +- .../fcb4efee8f8b_add_version_info_to_bay.py | 8 +- magnum/db/sqlalchemy/api.py | 6 +- magnum/db/sqlalchemy/models.py | 5 + magnum/drivers/common/driver.py | 15 + magnum/drivers/common/k8s_monitor.py | 28 +- ...onfigure_docker_storage_driver_fedora_coreos.sh | 37 + .../templates/kubernetes/fragments/add-proxy.sh | 36 +- .../kubernetes/fragments/calico-service-v3-3-x.sh | 671 +++++++++ .../kubernetes/fragments/calico-service.sh | 645 ++++++--- .../kubernetes/fragments/configure-etcd.sh | 110 +- .../fragments/configure-kubernetes-master.sh | 281 +++- .../fragments/configure-kubernetes-minion.sh | 181 ++- .../kubernetes/fragments/core-dns-service.sh | 12 +- .../kubernetes/fragments/disable-selinux.sh | 5 +- .../fragments/enable-cert-api-manager.sh | 6 +- .../kubernetes/fragments/enable-cinder-csi.sh | 521 +++++++ .../kubernetes/fragments/enable-helm-tiller.sh | 19 +- .../kubernetes/fragments/enable-ingress-octavia.sh | 14 +- .../kubernetes/fragments/enable-ingress-traefik.sh | 36 +- .../kubernetes/fragments/enable-keystone-auth.sh | 7 +- .../fragments/enable-prometheus-monitoring.sh | 21 +- .../kubernetes/fragments/enable-services-master.sh | 31 +- .../kubernetes/fragments/enable-services-minion.sh | 19 +- .../kubernetes/fragments/flannel-service.sh | 11 +- .../templates/kubernetes/fragments/install-cri.sh | 50 + .../kubernetes/fragments/install-helm-modules.sh | 13 +- .../fragments/kube-apiserver-to-kubelet-role.sh | 29 +- .../kubernetes/fragments/kube-dashboard-service.sh | 363 +++-- .../kubernetes/fragments/start-container-agent.sh | 65 +- .../kubernetes/fragments/upgrade-kubernetes.sh | 142 +- .../fragments/write-heat-params-master.sh | 239 ++-- .../kubernetes/fragments/write-heat-params.sh | 25 + .../templates/kubernetes/helm/ingress-nginx.sh | 30 +- .../templates/kubernetes/helm/metrics-server.sh | 37 +- .../kubernetes/helm/prometheus-adapter.sh | 122 ++ .../kubernetes/helm/prometheus-operator.sh | 8 +- magnum/drivers/heat/driver.py | 398 +++++- magnum/drivers/heat/k8s_coreos_template_def.py | 82 +- magnum/drivers/heat/k8s_fedora_template_def.py | 125 +- magnum/drivers/heat/k8s_template_def.py | 162 ++- magnum/drivers/heat/swarm_fedora_template_def.py | 87 +- magnum/drivers/heat/swarm_mode_template_def.py | 86 +- magnum/drivers/heat/template_def.py | 111 +- magnum/drivers/k8s_coreos_v1/template_def.py | 2 +- .../templates/fragments/enable-coredns.yaml | 2 +- .../k8s_coreos_v1/templates/kubecluster.yaml | 39 +- magnum/drivers/k8s_fedora_atomic_v1/driver.py | 66 +- .../templates/kubecluster.yaml | 364 ++++- .../k8s_fedora_atomic_v1/templates/kubemaster.yaml | 165 ++- .../k8s_fedora_atomic_v1/templates/kubeminion.yaml | 69 +- magnum/drivers/k8s_fedora_coreos_v1/__init__.py | 0 magnum/drivers/k8s_fedora_coreos_v1/driver.py | 32 + .../drivers/k8s_fedora_coreos_v1/template_def.py | 45 + .../drivers/k8s_fedora_coreos_v1/templates/COPYING | 202 +++ .../templates/fcct-config.yaml | 237 +++ .../templates/kubecluster.yaml | 1502 ++++++++++++++++++++ .../k8s_fedora_coreos_v1/templates/kubemaster.yaml | 1032 ++++++++++++++ .../k8s_fedora_coreos_v1/templates/kubeminion.yaml | 624 ++++++++ .../k8s_fedora_coreos_v1/templates/user_data.json | 151 ++ magnum/drivers/k8s_fedora_coreos_v1/version.py | 17 + .../templates/kubecluster.yaml | 37 +- magnum/drivers/mesos_ubuntu_v1/template_def.py | 78 +- .../mesos_ubuntu_v1/templates/mesoscluster.yaml | 20 +- .../swarm_fedora_atomic_v1/templates/cluster.yaml | 18 +- .../templates/swarmmaster.yaml | 2 +- .../templates/swarmcluster.yaml | 20 +- .../templates/swarmmaster.yaml | 2 +- magnum/hacking/checks.py | 27 +- magnum/objects/fields.py | 3 +- magnum/objects/nodegroup.py | 18 +- .../api/controllers/v1/test_cluster_actions.py | 127 +- .../unit/api/controllers/v1/test_nodegroup.py | 500 ++++++- .../conductor/handlers/test_cluster_conductor.py | 20 +- .../handlers/test_k8s_cluster_conductor.py | 122 +- .../handlers/test_mesos_cluster_conductor.py | 36 +- .../conductor/handlers/test_nodegroup_conductor.py | 218 +++ .../handlers/test_swarm_cluster_conductor.py | 42 +- .../drivers/test_k8s_fedora_atomic_v1_driver.py | 142 ++ playbooks/container-builder-setup-gate.yaml | 2 +- playbooks/container-builder-vars.yaml | 15 +- playbooks/container-builder.yaml | 13 + playbooks/container-publish.yaml | 3 + playbooks/magnum-buildimages-base.yaml | 98 -- playbooks/post/upload-images.yaml | 21 - ...alico-configuration-label-ae0b43a7c7123f02.yaml | 6 + .../cinder-csi-enabled-label-ab2b8ade63c57cf3.yaml | 4 + .../notes/containerd-598761bb536af6ba.yaml | 21 + .../notes/deprecate-heapster-7e8dea0bab06aa51.yaml | 5 + .../notes/drop-py27-support-7e2c4300341f9719.yaml | 6 + .../expose_traefik_metrics-aebbde99d4ecc231.yaml | 4 + .../notes/fedora_coreos-e66b44d86dea380f.yaml | 16 + .../fix-cert-apimanager-527352622c5a9c3b.yaml | 5 + .../notes/fix-fedora-proxy-a4b8d5fc4ec65e80.yaml | 6 + ...-nginx-getting-oom-killed-76139fd8b57e6c15.yaml | 11 + ...x-proxy-of-grafana-script-8b408d9d103dfc06.yaml | 4 + .../heapster-enabled-label-292ca1ddac68a156.yaml | 5 + ...m-install-metrics-service-e7a5459417504a75.yaml | 10 + .../notes/helm_client_label-1d6e70dfcf8ecd0d.yaml | 4 + ...-k8s-master-kubelet-taint-0c56ffede270116d.yaml | 5 + .../k8s-dashboard-v2.0.0-771ce78b527209d3.yaml | 5 + .../k8s-fcos-version-bumps-ca89507d2cf15384.yaml | 11 + .../notes/k8s-volumes-az-fix-85ad48998d2c12aa.yaml | 9 + .../notes/keystone-auth-repo-6970c05f44299326.yaml | 5 + .../notes/kubelet-nfs-b51e572adfb56378.yaml | 10 + ...missing-ip-in-api-address-c25eef757d5336aa.yaml | 8 + .../notes/nodegroup-limit-89930d45ee06c621.yaml | 4 + .../notes/prometheus-adapter-15fba9d739676e70.yaml | 10 + ...-compatible-with-k8s-1-16-f8be99cf527075b8.yaml | 5 + ...-driver-for-fedora-coreos-697ffcc47e7e8359.yaml | 5 + ...-fedora-atomic-os-upgrade-9f47182b21c6c028.yaml | 7 + ...support-post-install-file-1fe7afe7698dd7b2.yaml | 8 + .../support-selinux-mode-5bd2a3ece23a2caa.yaml | 5 + ...erification-for-hyperkube-fb2292c6a8bb00ba.yaml | 5 + ...8s-cluster-health-via-api-b8a3cac3031c50a5.yaml | 10 + ...-compatible-with-k8s-1-16-9a9ef6d3ccc92fb4.yaml | 4 + .../notes/upgrade-calico-6912a6f4fb5c21de.yaml | 5 + .../notes/upgrade-coredns-25f3879c3a658309.yaml | 5 + ...d-use-quay-io-coreos-etcd-1cb8e38e974f5975.yaml | 9 + .../notes/upgrade-flannel-db5ef049e23fc4a8.yaml | 4 + .../notes/upgrade_api-1fecc206e5b0ef99.yaml | 12 + .../notes/use_podman-39532143be2296c2.yaml | 22 + releasenotes/source/index.rst | 1 + .../locale/en_GB/LC_MESSAGES/releasenotes.po | 45 +- .../source/locale/fr/LC_MESSAGES/releasenotes.po | 64 - releasenotes/source/train.rst | 6 + requirements.txt | 1 - setup.cfg | 13 +- setup.py | 9 - test-requirements.txt | 5 +- tox.ini | 56 +- 272 files changed, 12661 insertions(+), 2227 deletions(-) Requirements updates -------------------- diff --git a/requirements.txt b/requirements.txt index f654bcc6..fa838067 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17 +16,0 @@ docker>=2.4.2 # Apache-2.0 -enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD diff --git a/test-requirements.txt b/test-requirements.txt index d966d21f..952e0b83 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13 +13 @@ fixtures>=3.0.0 # Apache-2.0/BSD -hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 +hacking>=3.0,<3.1.0 # Apache-2.0 @@ -20,2 +20 @@ pytz>=2013.6 # MIT -sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD -sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx>=1.8.0,!=2.1.0 # BSD