Skip to content

Commit

Permalink
(Python) consistency changes
Browse files Browse the repository at this point in the history
  • Loading branch information
tersmitten committed Mar 15, 2021
1 parent e311233 commit aa1f2ba
Show file tree
Hide file tree
Showing 15 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MAINTAINER Mischa ter Smitten <[email protected]>
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-dev curl && \
apt-get clean
RUN curl -sL https://bootstrap.pypa.io/get-pip.py | python -
RUN curl -sL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python -
RUN rm -rf $HOME/.cache

# ansible
Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# defaults file for rstudio
# defaults file
---
rstudio_version: "{{ '1.2.5042' if ansible_distribution == 'Debian' and ansible_distribution_version is version('9', '<') else '1.4.1103' }}"
rstudio_install: []
2 changes: 1 addition & 1 deletion handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# handlers file for rstudio
# handlers file
---
3 changes: 2 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# meta file for rstudio
# meta file
---
galaxy_info:
namespace: oefenweb
role_name: rstudio
author: Mischa ter Smitten
company: Oefenweb.nl B.V.
Expand Down
2 changes: 1 addition & 1 deletion tasks/install.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# tasks file for rstudio
# tasks file
---
- name: install | dependencies
apt:
Expand Down
2 changes: 1 addition & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# tasks file for rstudio
# tasks file
---
- name: include variables
include_vars: "{{ item }}"
Expand Down
2 changes: 1 addition & 1 deletion tests/test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# test file for rstudio
# test file
---
- hosts: localhost
connection: local
Expand Down
2 changes: 1 addition & 1 deletion tests/vagrant.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# test file for rstudio
# test file
---
- hosts: all
remote_user: vagrant
Expand Down
2 changes: 1 addition & 1 deletion tests/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# vars file for rstudio
# vars file
---
rstudio_install:
- r-base
2 changes: 1 addition & 1 deletion vars/_buster.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# vars file for rstudio
# vars file
---
rstudio_download_url: "https://download1.rstudio.org/desktop/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
2 changes: 1 addition & 1 deletion vars/_focal.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# vars file for rstudio
# vars file
---
rstudio_download_url: "https://download1.rstudio.org/desktop/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
2 changes: 1 addition & 1 deletion vars/_jessie.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# vars file for rstudio
# vars file
---
rstudio_download_url: "https://download1.rstudio.org/desktop/trusty/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
2 changes: 1 addition & 1 deletion vars/_stretch.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# vars file for rstudio
# vars file
---
rstudio_download_url: "https://download1.rstudio.org/desktop/debian9/{{ ansible_machine }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
2 changes: 1 addition & 1 deletion vars/_ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# vars file for rstudio
# vars file
---
rstudio_download_url: "https://download1.rstudio.org/desktop/{{ ansible_distribution_release }}/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
2 changes: 1 addition & 1 deletion vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# vars file for rstudio
# vars file
---
rstudio_dependencies:
- curl
Expand Down

0 comments on commit aa1f2ba

Please sign in to comment.