Merge pull request #504 from ripleymj/realign-courses

Realign courses
jmunixusers · Aug 7, 2022 · 9766387 · 9766387
2 parents 3342a2a + 8ec06a6
commit 9766387
Show file tree

Hide file tree

Showing 29 changed files with 21 additions and 466 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -69,11 +69,9 @@ jobs:
       - name: Install dependencies
         run: |
           pip3 install pyyaml pygobject pylint click PyGithub jinja2 aiohttp
-      # We cannot just do roles/*/*/*py because we do not want to lint the
-      # finch scripts which we cannot change
       - name: Run pylint
         run: |
-          pylint roles/common/*/*.py scripts/*.py
+          pylint roles/*/*/*.py scripts/*.py
   Shell:
     name: Run Shell linting
     runs-on: ubuntu-20.04

diff --git a/README.md b/README.md
@@ -21,29 +21,17 @@ using these tasks and the VM is available
 * VM management script
 * JMU wireless printing
 
-### CS101
-* Eclipse (with checkstyle plugin)
-* Finch robot
+### CS101 / CS149
 * Mint packages (basic-prog-pkgs role)
-  * artha
-  * bless
-  * chromium-browser
-  * geany
-  * idle
   * libreoffice
   * logisim
   * meld
-  * sqlitebrowser
+  * sqlite / sqlitebrowser
   * thonny
-  * wireshark
-
-### CS149
-* Eclipse (with checkstyle plugin)
-* jGRASP
-* Visual Studio Code (with Java and checkstyle plugins)
 
 ### CS159
 * Eclipse (with checkstyle plugin)
+* Visual Studio Code (with Java and checkstyle plugins)
 
 ### CS261
 * Mint packages (adv-prog-pkgs role)

diff --git a/local.yml b/local.yml
@@ -7,11 +7,9 @@
     - { role: user, tags: always }
     - { role: wireless_printing, tags: always }
     - { role: filezilla, tags: always }
-    - { role: basic_prog_pkgs, tags: ["cs101"] }
+    - { role: basic_prog_pkgs, tags: ["cs101", "cs149"] }
     - { role: adv_prog_pkgs, tags: ["cs261", "cs361", "cs432"] }
-    - { role: eclipse, tags: ["cs101", "cs149", "cs159"] }
-    - { role: jgrasp, tags: ["cs149"] }
-    - { role: finch, tags: ["cs101"] }
+    - { role: eclipse, tags: ["cs159"] }
     - { role: y86, tags: ["cs261", "cs432"] }
     - { role: programming_langs, tags: ["cs430"] }
-    - { role: vscode, tags: ["cs149"] }
+    - { role: vscode, tags: ["cs159"] }
diff --git a/roles/basic_prog_pkgs/files/.idlerc/config-keys.cfg b/roles/basic_prog_pkgs/files/.idlerc/config-keys.cfg
diff --git a/roles/basic_prog_pkgs/files/.idlerc/config-main.cfg b/roles/basic_prog_pkgs/files/.idlerc/config-main.cfg
diff --git a/roles/basic_prog_pkgs/files/mimeapps.list b/roles/basic_prog_pkgs/files/mimeapps.list
diff --git a/roles/basic_prog_pkgs/tasks/main.yml b/roles/basic_prog_pkgs/tasks/main.yml
@@ -5,27 +5,10 @@
     name: '{{ basic_prog_pkgs_intro_development }}'
     state: latest
 
-- name: Copy idlerc prefs
-  ansible.builtin.copy:
-    src: .idlerc
-    dest: '{{ item.homedir }}'
-    owner: '{{ item.uid }}'
-    group: '{{ item.gid }}'
-    directory_mode: "0750"
-    mode: "0640"
-  loop: "{{ real_users }}"
-- name: Copy mimeapps Idle pref
-  ansible.builtin.copy:
-    src: mimeapps.list
-    dest: '{{ item.homedir }}/.config/'
-    owner: '{{ item.uid }}'
-    group: '{{ item.gid }}'
-    mode: "0640"
-    force: no
-  loop: "{{ real_users }}"
-- name: Set Idle pref in existing mimeapps
-  ansible.builtin.lineinfile:
-    path: '{{ item.homedir }}/.config/mimeapps.list'
-    regexp: '^text/x-python='
-    line: 'text/x-python=idle-python3.6.desktop;gedit.desktop;pluma.desktop'
+- name: Install intro pip packages
+  ansible.builtin.pip:
+    name: '{{ basic_prog_pkgs_pip }}'
+    state: present
+  become: yes
+  become_user: "{{ item.user }}"
   loop: "{{ real_users }}"
diff --git a/roles/basic_prog_pkgs/vars/main.yml b/roles/basic_prog_pkgs/vars/main.yml
@@ -1,18 +1,16 @@
 ---
 # vars file for basic-prog-pkgs
 basic_prog_pkgs_intro_development:
- - artha
- - bless
- - chromium-browser
- - fonts-crosextra-caladea
- - fonts-crosextra-carlito
- - geany
- - idle
+ - flake8
+ - ipython3
  - libreoffice
- - libreoffice-templates
- - libreoffice-style-tango
  - logisim
  - meld
+ - python-is-python3
+ - python3-flake8-docstrings
+ - sqlite
  - sqlitebrowser
  - thonny
- - wireshark
+
+basic_prog_pkgs_pip:
+ - darglint
diff --git a/roles/finch/README.md b/roles/finch/README.md
diff --git a/roles/finch/defaults/main.yml b/roles/finch/defaults/main.yml
diff --git a/roles/finch/files/55-finch.rules b/roles/finch/files/55-finch.rules
diff --git a/roles/finch/files/dance2.py b/roles/finch/files/dance2.py
diff --git a/roles/finch/files/maze.py b/roles/finch/files/maze.py
diff --git a/roles/finch/handlers/main.yml b/roles/finch/handlers/main.yml
diff --git a/roles/finch/meta/main.yml b/roles/finch/meta/main.yml
diff --git a/roles/finch/tasks/main.yml b/roles/finch/tasks/main.yml
diff --git a/roles/finch/tests/inventory b/roles/finch/tests/inventory
diff --git a/roles/finch/tests/test.yml b/roles/finch/tests/test.yml
diff --git a/roles/finch/vars/main.yml b/roles/finch/vars/main.yml