Merge branch 'python3_compatability'

plone · Jul 21, 2019 · aaeaf93 · aaeaf93
2 parents 9e2929a + 95c7b22
commit aaeaf93
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/HISTORY.txt b/HISTORY.txt
@@ -1,4 +1,4 @@
-1.3.7 unreleased
+1.3.7 2019-07-21
 
 - Make it possible to use Python 3 with Plone 5.2.
   Allow plone_python_version to be set generally or per plone server.

diff --git a/Vagrantfile b/Vagrantfile
@@ -82,6 +82,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.define "xenial", autostart: false do |myhost|
     myhost.vm.box = "ubuntu/xenial64"
+    myhost.vm.provision "shell", inline: "apt-get update"
     myhost.vm.provision "shell", inline: "apt-get install -y python"
     myhost.vm.provision "write_vbox_cfg", machine: "xenial"
     myhost.vm.provision "ansible" do |ansible|
@@ -91,6 +92,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.define "bionic", primary: true, autostart: true do |myhost|
     myhost.vm.box = "ubuntu/bionic64"
+    myhost.vm.provision "shell", inline: "apt-get update"
     myhost.vm.provision "shell", inline: "apt-get install -y python python-pip"
     myhost.vm.provision "write_vbox_cfg", machine: "bionic"
     myhost.vm.provision "ansible" do |ansible|

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -50,6 +50,7 @@ plone_debian_packages:
   - cron
   - curl
   - git
+  - libffi-dev
   - libjpeg-dev
   - libssl-dev
   - libxslt1-dev

diff --git a/test.yml b/test.yml
@@ -72,13 +72,13 @@
         plone_client_count: 0
         plone_backup_path: /var/local/custom_backup_path
 
-      - plone_version: '5.2rc2-pending'
+      - plone_version: '5.2.0'
         plone_instance_name: p52py27
 
         plone_zeo_port: 3100
         plone_client_base_port: 3080
 
-      - plone_version: '5.2rc2-pending'
+      - plone_version: '5.2.0'
         plone_instance_name: p52py3
         plone_python_version: '3'