EbookFoundation
/
regluit-provisioning
mirror of https://github.com/EbookFoundation/regluit-provisioning.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make that py3.8

py37
eric 2022-05-03 20:55:08 -04:00
parent 5d7df0446a
commit da8c369ff8
8 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Pipfile
View File

@ -6,7 +6,7 @@ verify_ssl = true
[dev-packages]
[packages]
ansible = "==2.9.6"
ansible = "==2.10.7"
[requires]
python_version = "3.7"

29
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
"sha256": "08587c830a7eeb94395c406b3a0d043cc9fcd3815648997a772acf8e541d24bd"
"sha256": "d6643330f1eb2298a71bcda8ab4bc2305f867ef8d677203c6c11d707117239e2"
},
"pipfile-spec": 6,
"requires": {
@ -18,10 +18,17 @@
"default": {
"ansible": {
"hashes": [
"sha256:59cf3a0781f89992d1dae5205b07e802dff1db205eebd238de9e503b62b8cbc9"
"sha256:9ff024500116d53c460cb09ea92e3c9404119f100d1d1ff0de69a9dafca561d5"
],
"index": "pypi",
"version": "==2.9.6"
"version": "==2.10.7"
},
"ansible-base": {
"hashes": [
"sha256:ef925882ca8d4c3c2ccd091cde199e0c869024ccad0d07a337dcf207bff32f34"
],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
"version": "==2.10.17"
},
"cffi": {
"hashes": [
@ -160,6 +167,14 @@
"markers": "python_version >= '3.7'",
"version": "==2.1.1"
},
"packaging": {
"hashes": [
"sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb",
"sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"
],
"markers": "python_version >= '3.6'",
"version": "==21.3"
},
"pycparser": {
"hashes": [
"sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9",
@ -167,6 +182,14 @@
],
"version": "==2.21"
},
"pyparsing": {
"hashes": [
"sha256:7bf433498c016c4314268d95df76c81b842a4cb2b276fa3312cfb1e1d85f6954",
"sha256:ef7b523f6356f763771559412c0d7134753f037822dad1b16945b7b846f7ad06"
],
"markers": "python_full_version >= '3.6.8'",
"version": "==3.0.8"
},
"pyyaml": {
"hashes": [
"sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293",

9
roles/regluit_common/tasks/main.yml
View File

@ -1,9 +1,8 @@
---
# Need to install python3.7 and pip first so Ansible will function
# This is due to Ubuntu 18 shipping with Python3 by default
- name: Install python3.7 and pip for common
# Need to install python3.8 and pip first so Ansible will function
- name: Install python3.8 and pip for common
become: true
raw: bash -c "apt -qqy update && apt install -qqy python3.7-dev python3-pip"
raw: bash -c "apt -qqy update && apt install -qqy python3.8-dev python3-pip"
register: output
changed_when: output.stdout != ""
@ -31,7 +30,7 @@
- name: Add project to PYTHONPATH of virtualenv
template:
src: "{{ item }}.j2"
dest: "{{ project_path }}/venv/lib/python3.7/site-packages/{{ item }}"
dest: "{{ project_path }}/venv/lib/python3.8/site-packages/{{ item }}"
with_items:
- 'regluit.pth'
- 'opt.pth'

2
roles/regluit_dev/tasks/main.yml
View File

@ -34,7 +34,7 @@
- name: Add project to PYTHONPATH of virtualenv
template:
src: "{{ item }}.j2"
dest: "{{ project_path }}/venv/lib/python3.7/site-packages/{{ item }}"
dest: "{{ project_path }}/venv/lib/python3.8/site-packages/{{ item }}"
with_items:
- 'regluit.pth'
- 'opt.pth'

7
roles/regluit_prod/tasks/main.yml
View File

@ -2,7 +2,7 @@
- name: Install prod dependencies
become: true
apt:
name: ['git', 'python-setuptools', 'libxml2-dev', 'libxslt1-dev', 'python3-lxml', 'python-dev', 'python-virtualenv', 'build-essential', 'libssl-dev', 'libffi-dev','mysql-client', 'libmysqlclient-dev', 'libcairo2', 'postfix', 'libjpeg-dev']
name: ['git', 'python-setuptools', 'libxml2-dev', 'libxslt1-dev', 'python3-lxml', 'python-dev', 'python3-virtualenv', 'build-essential', 'libssl-dev', 'libffi-dev','mysql-client', 'libmysqlclient-dev', 'libcairo2', 'postfix', 'libjpeg-dev']
update_cache: true
state: present
@ -21,7 +21,7 @@
repo: "{{ git_repo }}"
dest: "{{ project_path }}"
version: "{{ git_branch }}"
- name: Install python packages to virtualenv
pip:
requirements: "{{ project_path }}/requirements.txt"
@ -31,12 +31,13 @@
- name: Add project to PYTHONPATH of virtualenv
template:
src: "{{ item }}.j2"
dest: "{{ project_path }}/venv/lib/python3.7/site-packages/{{ item }}"
dest: "{{ project_path }}/venv/lib/python3.8/site-packages/{{ item }}"
with_items:
- 'regluit.pth'
- 'opt.pth'
- name: Create lock directory
become: yes
file:
path: "{{ project_path}}/.lock"
state: directory

5
setup-batterup.yml
View File

@ -2,9 +2,8 @@
- hosts: regluit-ondeck
gather_facts: false
tasks:
# Need to install python3.6 and pip first so Ansible will function
# This is due to Ubuntu 16 shipping with Python3 by default
- name: Install python3.6 and pip
# Need to install python3.8 and pip first so Ansible will function
- name: Install python3.8 and pip
become: true
raw: bash -c "apt -qqy update && apt install -qqy python3.6-dev python-pip"
register: output

6
setup-dev.yml
View File

@ -1,10 +1,10 @@
- hosts: regluit-dev
gather_facts: false
tasks:
# Need to install python3.7 and pip first so Ansible will function
- name: Install python3.7 and pip for dev
# Need to install python3.8 and pip first so Ansible will function
- name: Install python3.8 and pip for dev
become: true
raw: bash -c "apt -qqy update && apt install -y python3.7 python3-pip python3-apt"
raw: bash -c "apt -qqy update && apt install -y python3.8 python3-pip python3-apt"
register: output
changed_when: output.stdout != ""

6
setup-prod.yml
View File

@ -1,10 +1,10 @@
- hosts: regluit-prod
gather_facts: false
tasks:
# Need to install python3.7 and pip first so Ansible will function
- name: Install python3.7 and pip for dev
# Need to install python3.8 and pip first so Ansible will function
- name: Install python3.8 and pip for dev
become: true
raw: bash -c "apt -qqy update && apt install -y python3.7 python3-pip python3-apt"
raw: bash -c "apt -qqy update && apt install -y python3.8 python3-pip python3-apt"
register: output
changed_when: output.stdout != ""