merging

Author: ttimbers

.github/workflows/publish_image_to_dockerhub.yml

@@ -0,0 +1,40 @@
+name: Publish Docker image on DockerHub
+on: 
+  push: 
+    paths: 
+      - 'Dockerfile'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - uses: actions/checkout@master
+      with:
+        fetch-depth: '0'
+    - name: Bump version and push tag
+      uses: anothrNick/[email protected]
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        WITH_V: true
+      id: bump
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+      with:
+        tag_name: ${{ steps.bump.outputs.new_tag }}
+        release_name: ${{ steps.bump.outputs.new_tag }}
+        body: |
+          Changes in this Release
+          - Rebuilt Docker image and published to DockerHub with new tag
+        draft: false
+        prerelease: false
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: ubcdsci/intro-to-ds
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        tags: "latest,${{ steps.bump.outputs.new_tag }}"
+    

03-viz.Rmd

@@ -39,7 +39,7 @@ are external references that contain a wealth of additional information on the t
 - Use `ggsave` to save visualizations in `.png` and `.svg` format
 
 ## Choosing the visualization
-#### *Ask a question, and answer it* {-#my-section}
+#### *Ask a question, and answer it*
 
 The purpose of a visualization is to answer a question about a data set of interest. So naturally, the first thing to do **before** creating 
 a visualization is to formulate the question about the data that you are trying to answer. 
@@ -68,7 +68,7 @@ again typically a better alternative.
 
 
 ## Refining the visualization
-#### *Convey the message, minimize noise* {-#my-section}
+#### *Convey the message, minimize noise*
 
 Just being able to make a visualization in R with `ggplot2` (or any other tool for that matter) doesn't mean that it is effective at communicating 
 your message to others. Once you have selected a broad type of visualization to use, you will have to refine it to suit your particular need.
@@ -98,7 +98,7 @@ making it easier for them to quickly understand and remember your message.
 
 
 ## Creating visualizations with `ggplot2` 
-#### *Build the visualization iteratively* {-#my-section}
+#### *Build the visualization iteratively*
 
 This section will cover examples of how to choose and refine a visualization given a data set and a question that you want to answer, 
 and then how to create the visualization in R using `ggplot2`. To use the `ggplot2` library, we need to load the `tidyverse` metapackage.
@@ -379,7 +379,7 @@ admirable job given the technology available at the time period.
 
 
 ## Explaining the visualization
-#### *Tell a story* {-#my-section}
+#### *Tell a story*
 
 Typically, your visualization will not be shown completely on its own, but rather it will be part of a larger presentation.
 Further, visualizations can provide supporting information for any part of a presentation, from opening to conclusion.
@@ -425,7 +425,7 @@ worth further investigation into the differences between these experiments to se
 
 
 ## Saving the visualization
-#### *Choose the right output format for your needs* {-#my-section}
+#### *Choose the right output format for your needs*
 
 Just as there are many ways to store data sets, there are many ways to store visualizations and images.
 Which one you choose can depend on a number of factors, such as file size/type limitations 

Dockerfile

@@ -1,3 +1,4 @@
+# Copyright (c) UBC-DSCI Development Team.
 FROM rocker/verse:4.0.0
 
 RUN apt-get update --fix-missing \

data/can_lang.csv

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 category,language,mother_tongue,most_at_home,most_at_work,lang_known
 Aboriginal languages,"Aboriginal languages, n.o.s.",590,235,30,665
 Non-Official & Non-Aboriginal languages,Afrikaans,10260,4785,85,23415
@@ -213,3 +214,220 @@ Aboriginal languages,Woods Cree,1840,800,75,2665
 Non-Official & Non-Aboriginal languages,Wu (Shanghainese),12915,7650,105,16530
 Non-Official & Non-Aboriginal languages,Yiddish,13555,7085,895,20985
 Non-Official & Non-Aboriginal languages,Yoruba,9080,2615,15,22415
+=======
+category,language,mother_tongue,most_at_home,most_at_work,lang_known
+Aboriginal languages,"Aboriginal languages, n.o.s.",590,235,30,665
+Non-Official & Non-Aboriginal languages,Afrikaans,10260,4785,85,23415
+Non-Official & Non-Aboriginal languages,"Afro-Asiatic languages, n.i.e.",1150,445,10,2775
+Non-Official & Non-Aboriginal languages,Akan (Twi),13460,5985,25,22150
+Non-Official & Non-Aboriginal languages,Albanian,26895,13135,345,31930
+Aboriginal languages,"Algonquian languages, n.i.e.",45,10,0,120
+Aboriginal languages,Algonquin,1260,370,40,2480
+Non-Official & Non-Aboriginal languages,American Sign Language,2685,3020,1145,21930
+Non-Official & Non-Aboriginal languages,Amharic,22465,12785,200,33670
+Non-Official & Non-Aboriginal languages,Arabic,419890,223535,5585,629055
+Non-Official & Non-Aboriginal languages,Armenian,33460,21510,450,41295
+Non-Official & Non-Aboriginal languages,Assyrian Neo-Aramaic,16070,10510,205,19740
+Aboriginal languages,"Athabaskan languages, n.i.e.",50,10,0,85
+Aboriginal languages,Atikamekw,6150,5465,1100,6645
+Non-Official & Non-Aboriginal languages,"Austro-Asiatic languages, n.i.e",170,80,0,190
+Non-Official & Non-Aboriginal languages,"Austronesian languages, n.i.e.",4195,1160,35,5585
+Non-Official & Non-Aboriginal languages,Azerbaijani,3255,1245,25,5455
+Aboriginal languages,Babine (Wetsuwet'en),110,20,10,210
+Non-Official & Non-Aboriginal languages,Bamanankan,1535,345,0,3190
+Aboriginal languages,Beaver,190,50,0,340
+Non-Official & Non-Aboriginal languages,Belarusan,810,225,0,2265
+Non-Official & Non-Aboriginal languages,Bengali,73125,47350,525,91220
+Non-Official & Non-Aboriginal languages,"Berber languages, n.i.e.",8985,2615,15,12510
+Non-Official & Non-Aboriginal languages,Bikol,1785,290,0,2075
+Non-Official & Non-Aboriginal languages,Bilen,805,615,15,1085
+Aboriginal languages,Blackfoot,2815,1110,85,5645
+Non-Official & Non-Aboriginal languages,Bosnian,12215,6045,155,18265
+Non-Official & Non-Aboriginal languages,Bulgarian,20020,11985,200,22425
+Non-Official & Non-Aboriginal languages,Burmese,3585,2245,75,4995
+Non-Official & Non-Aboriginal languages,Cantonese,565270,400220,58820,699125
+Aboriginal languages,Carrier,1025,250,15,2100
+Non-Official & Non-Aboriginal languages,Catalan,870,350,30,2035
+Aboriginal languages,Cayuga,45,10,10,125
+Non-Official & Non-Aboriginal languages,Cebuano,19890,7205,70,27040
+Non-Official & Non-Aboriginal languages,"Celtic languages, n.i.e.",525,80,10,3595
+Non-Official & Non-Aboriginal languages,Chaldean Neo-Aramaic,5545,3445,35,7115
+Aboriginal languages,Chilcotin,655,255,15,1150
+Non-Official & Non-Aboriginal languages,"Chinese languages, n.i.e.",615,280,0,590
+Non-Official & Non-Aboriginal languages,"Chinese, n.o.s.",38580,23940,2935,41685
+Aboriginal languages,Comox,85,0,0,185
+Aboriginal languages,"Cree, n.o.s.",64050,37950,7800,86115
+Non-Official & Non-Aboriginal languages,"Creole languages, n.i.e.",4985,2005,15,16635
+Non-Official & Non-Aboriginal languages,"Creole, n.o.s.",64110,24570,310,133045
+Non-Official & Non-Aboriginal languages,Croatian,48200,16775,220,69835
+Non-Official & Non-Aboriginal languages,"Cushitic languages, n.i.e.",365,180,0,480
+Non-Official & Non-Aboriginal languages,Czech,22295,6235,70,28725
+Aboriginal languages,Dakota,1210,255,20,1760
+Non-Official & Non-Aboriginal languages,Danish,12630,855,85,15750
+Aboriginal languages,Dene,10700,7710,770,13060
+Non-Official & Non-Aboriginal languages,Dinka,2120,1130,0,2475
+Aboriginal languages,Dogrib (Tlicho),1650,1020,165,2375
+Non-Official & Non-Aboriginal languages,"Dravidian languages, n.i.e.",490,190,0,790
+Non-Official & Non-Aboriginal languages,Dutch,99015,9565,1165,120870
+Non-Official & Non-Aboriginal languages,Edo,1670,410,0,3220
+Official languages,English,19460850,22162865,15265335,29748265
+Non-Official & Non-Aboriginal languages,Estonian,5445,975,55,6070
+Non-Official & Non-Aboriginal languages,Ewe,1760,405,10,3000
+Non-Official & Non-Aboriginal languages,Fijian,745,195,0,1665
+Non-Official & Non-Aboriginal languages,Finnish,15295,2790,105,17590
+Official languages,French,7166700,6943800,3825215,10242945
+Non-Official & Non-Aboriginal languages,Frisian,2100,185,40,2910
+Non-Official & Non-Aboriginal languages,"Fulah (Pular, Pulaar, Fulfulde)",2825,825,0,4725
+Non-Official & Non-Aboriginal languages,Ga,920,250,0,2250
+Non-Official & Non-Aboriginal languages,Ganda,1295,345,25,2495
+Non-Official & Non-Aboriginal languages,Georgian,1710,1040,25,2150
+Non-Official & Non-Aboriginal languages,German,384040,120335,10065,502735
+Non-Official & Non-Aboriginal languages,"Germanic languages, n.i.e.",525,1630,725,8705
+Aboriginal languages,Gitxsan (Gitksan),880,315,10,1305
+Non-Official & Non-Aboriginal languages,Greek,106525,44550,1020,150965
+Non-Official & Non-Aboriginal languages,Gujarati,108780,64150,885,149045
+Aboriginal languages,Gwich'in,255,50,10,360
+Aboriginal languages,Haida,80,10,0,465
+Aboriginal languages,Haisla,90,20,0,175
+Non-Official & Non-Aboriginal languages,Haitian Creole,3030,1280,25,6855
+Non-Official & Non-Aboriginal languages,Hakka,10910,4085,70,12445
+Aboriginal languages,Halkomelem,480,50,20,1060
+Non-Official & Non-Aboriginal languages,Harari,1320,735,0,1715
+Non-Official & Non-Aboriginal languages,Hebrew,19530,8560,825,75020
+Aboriginal languages,Heiltsuk,100,5,10,125
+Non-Official & Non-Aboriginal languages,Hiligaynon,6880,2210,25,7925
+Non-Official & Non-Aboriginal languages,Hindi,110645,55510,1405,433365
+Non-Official & Non-Aboriginal languages,Hmong-Mien languages,795,335,10,870
+Non-Official & Non-Aboriginal languages,Hungarian,61235,19480,440,71285
+Non-Official & Non-Aboriginal languages,Icelandic,1285,270,0,1780
+Non-Official & Non-Aboriginal languages,Igbo,4235,1000,10,8855
+Non-Official & Non-Aboriginal languages,Ilocano,26345,9125,110,34530
+Non-Official & Non-Aboriginal languages,"Indo-Iranian languages, n.i.e.",5185,2380,20,8870
+Aboriginal languages,Inuinnaqtun (Inuvialuktun),1020,165,30,1975
+Aboriginal languages,"Inuit languages, n.i.e.",310,90,15,470
+Aboriginal languages,Inuktitut,35210,29230,8795,40620
+Aboriginal languages,"Iroquoian languages, n.i.e.",35,5,0,115
+Non-Official & Non-Aboriginal languages,Italian,375635,115415,1705,574725
+Non-Official & Non-Aboriginal languages,"Italic (Romance) languages, n.i.e.",720,175,25,2680
+Non-Official & Non-Aboriginal languages,Japanese,43640,19785,3255,83095
+Non-Official & Non-Aboriginal languages,Kabyle,13150,5490,15,17120
+Non-Official & Non-Aboriginal languages,Kannada,3970,1630,10,8245
+Non-Official & Non-Aboriginal languages,Karenic languages,4705,3860,135,4895
+Non-Official & Non-Aboriginal languages,Kashmiri,565,135,0,905
+Aboriginal languages,Kaska (Nahani),180,20,10,365
+Non-Official & Non-Aboriginal languages,Khmer (Cambodian),20130,10885,475,27035
+Non-Official & Non-Aboriginal languages,Kinyarwanda (Rwanda),5250,1530,25,7860
+Non-Official & Non-Aboriginal languages,Konkani,3330,720,10,6790
+Non-Official & Non-Aboriginal languages,Korean,153425,109705,12150,172750
+Non-Official & Non-Aboriginal languages,Kurdish,11705,6580,185,15290
+Aboriginal languages,Kutenai,110,10,0,170
+Aboriginal languages,Kwakiutl (Kwak'wala),325,25,15,605
+Non-Official & Non-Aboriginal languages,Lao,12670,6175,150,17235
+Non-Official & Non-Aboriginal languages,Latvian,5450,1255,35,6500
+Aboriginal languages,Lillooet,315,25,15,790
+Non-Official & Non-Aboriginal languages,Lingala,3805,1045,10,17010
+Non-Official & Non-Aboriginal languages,Lithuanian,7075,2015,60,8185
+Non-Official & Non-Aboriginal languages,Macedonian,16770,6830,95,23075
+Non-Official & Non-Aboriginal languages,Malagasy,1430,430,0,2340
+Non-Official & Non-Aboriginal languages,Malay,12275,3625,140,22470
+Non-Official & Non-Aboriginal languages,Malayalam,28565,15440,95,37810
+Aboriginal languages,Malecite,300,55,10,760
+Non-Official & Non-Aboriginal languages,Maltese,5565,1125,25,7625
+Non-Official & Non-Aboriginal languages,Mandarin,592040,462890,60090,814450
+Non-Official & Non-Aboriginal languages,Marathi,8295,3780,30,15565
+Aboriginal languages,Mi'kmaq,6690,3565,915,9025
+Aboriginal languages,Michif,465,80,10,1210
+Non-Official & Non-Aboriginal languages,Min Dong,1230,345,30,1045
+Non-Official & Non-Aboriginal languages,"Min Nan (Chaochow, Teochow, Fukien, Taiwanese)",31800,13965,565,42840
+Aboriginal languages,Mohawk,985,255,30,2415
+Non-Official & Non-Aboriginal languages,Mongolian,1575,905,10,2095
+Aboriginal languages,Montagnais (Innu),10235,8585,2055,11445
+Aboriginal languages,Moose Cree,105,10,0,195
+Aboriginal languages,Naskapi,1205,1195,370,1465
+Non-Official & Non-Aboriginal languages,Nepali,18275,13375,195,21385
+Non-Official & Non-Aboriginal languages,"Niger-Congo languages, n.i.e.",19135,4010,30,40760
+Non-Official & Non-Aboriginal languages,"Nilo-Saharan languages, n.i.e.",3750,1520,0,4550
+Aboriginal languages,Nisga'a,400,75,10,1055
+Aboriginal languages,North Slavey (Hare),765,340,95,1005
+Aboriginal languages,Northern East Cree,315,110,35,550
+Aboriginal languages,Northern Tutchone,220,30,0,280
+Non-Official & Non-Aboriginal languages,Norwegian,4615,350,70,8120
+Aboriginal languages,Nuu-chah-nulth (Nootka),280,30,10,560
+Aboriginal languages,Oji-Cree,12855,7905,1080,15605
+Aboriginal languages,Ojibway,17885,6175,765,28580
+Aboriginal languages,Okanagan,275,80,20,820
+Aboriginal languages,Oneida,60,15,0,185
+Non-Official & Non-Aboriginal languages,Oriya (Odia),1055,475,0,1530
+Non-Official & Non-Aboriginal languages,Oromo,4960,3410,45,6245
+Non-Official & Non-Aboriginal languages,"Other languages, n.i.e.",3685,1110,80,9730
+Aboriginal languages,Ottawa (Odawa),150,75,0,205
+Non-Official & Non-Aboriginal languages,"Pampangan (Kapampangan, Pampango)",4045,1200,10,5425
+Non-Official & Non-Aboriginal languages,Pangasinan,1390,240,0,1800
+Non-Official & Non-Aboriginal languages,Pashto,16905,10590,50,23180
+Non-Official & Non-Aboriginal languages,Persian (Farsi),214200,143025,4580,252325
+Aboriginal languages,Plains Cree,3065,1345,95,5905
+Non-Official & Non-Aboriginal languages,Polish,181710,74780,2495,214965
+Non-Official & Non-Aboriginal languages,Portuguese,221535,98710,7485,295955
+Non-Official & Non-Aboriginal languages,Punjabi (Panjabi),501680,349140,27865,668240
+Non-Official & Non-Aboriginal languages,Quebec Sign Language,695,730,130,4665
+Non-Official & Non-Aboriginal languages,Romanian,96660,53325,745,115050
+Non-Official & Non-Aboriginal languages,Rundi (Kirundi),5850,2110,0,8590
+Non-Official & Non-Aboriginal languages,Russian,188255,116595,4855,269645
+Aboriginal languages,"Salish languages, n.i.e.",260,25,0,560
+Aboriginal languages,Sarsi (Sarcee),80,10,0,145
+Non-Official & Non-Aboriginal languages,Scottish Gaelic,1090,190,15,3980
+Aboriginal languages,Sekani,85,15,0,185
+Non-Official & Non-Aboriginal languages,"Semitic languages, n.i.e.",2150,1205,65,3220
+Non-Official & Non-Aboriginal languages,Serbian,57350,31750,530,73780
+Non-Official & Non-Aboriginal languages,Serbo-Croatian,9550,3890,30,11275
+Non-Official & Non-Aboriginal languages,Shona,3185,1035,0,5430
+Aboriginal languages,Shuswap (Secwepemctsin),445,50,35,1305
+Non-Official & Non-Aboriginal languages,"Sign languages, n.i.e",4125,6690,645,22280
+Non-Official & Non-Aboriginal languages,Sindhi,11860,4975,35,20260
+Non-Official & Non-Aboriginal languages,Sinhala (Sinhalese),16335,7790,40,27825
+Aboriginal languages,"Siouan languages, n.i.e.",55,20,0,140
+Aboriginal languages,"Slavey, n.o.s.",280,105,10,675
+Non-Official & Non-Aboriginal languages,"Slavic languages, n.i.e.",2420,670,10,2995
+Non-Official & Non-Aboriginal languages,Slovak,17580,5610,100,21470
+Non-Official & Non-Aboriginal languages,Slovene (Slovenian),9785,2055,15,11490
+Non-Official & Non-Aboriginal languages,Somali,36755,22895,220,49660
+Aboriginal languages,South Slavey,945,370,35,1365
+Aboriginal languages,Southern East Cree,45,15,0,40
+Aboriginal languages,Southern Tutchone,70,5,0,145
+Non-Official & Non-Aboriginal languages,Spanish,458850,263505,13030,995260
+Aboriginal languages,Squamish,40,5,10,285
+Aboriginal languages,Stoney,3025,1950,240,3675
+Aboriginal languages,Straits,80,25,15,365
+Non-Official & Non-Aboriginal languages,Swahili,13370,5370,80,38685
+Aboriginal languages,Swampy Cree,1440,330,10,2350
+Non-Official & Non-Aboriginal languages,Swedish,6840,1050,125,14140
+Non-Official & Non-Aboriginal languages,"Tagalog (Pilipino, Filipino)",431385,213790,3450,612735
+Aboriginal languages,Tahltan,95,5,0,265
+Non-Official & Non-Aboriginal languages,"Tai-Kadai languages, n.i.e",85,30,0,115
+Non-Official & Non-Aboriginal languages,Tamil,140720,96955,2085,189860
+Non-Official & Non-Aboriginal languages,Telugu,15660,8280,40,23165
+Non-Official & Non-Aboriginal languages,Thai,9255,3365,525,15395
+Aboriginal languages,Thompson (Ntlakapamux),335,20,0,450
+Non-Official & Non-Aboriginal languages,Tibetan,6160,4590,50,7050
+Non-Official & Non-Aboriginal languages,"Tibeto-Burman languages, n.i.e.",1405,655,15,2380
+Non-Official & Non-Aboriginal languages,Tigrigna,16645,10205,130,21340
+Aboriginal languages,Tlingit,95,0,10,260
+Aboriginal languages,Tsimshian,200,30,10,410
+Non-Official & Non-Aboriginal languages,"Turkic languages, n.i.e.",1315,455,10,1875
+Non-Official & Non-Aboriginal languages,Turkish,32815,18955,690,50770
+Non-Official & Non-Aboriginal languages,Ukrainian,102485,28250,1210,132115
+Non-Official & Non-Aboriginal languages,"Uralic languages, n.i.e.",10,5,0,25
+Non-Official & Non-Aboriginal languages,Urdu,210815,128785,1495,322220
+Non-Official & Non-Aboriginal languages,Uyghur,1035,610,20,1390
+Non-Official & Non-Aboriginal languages,Uzbek,1720,995,15,2465
+Non-Official & Non-Aboriginal languages,Vietnamese,156430,104245,8075,198895
+Non-Official & Non-Aboriginal languages,Vlaams (Flemish),3895,355,35,4400
+Aboriginal languages,"Wakashan languages, n.i.e.",10,0,0,25
+Non-Official & Non-Aboriginal languages,Waray-Waray,1110,310,0,1395
+Non-Official & Non-Aboriginal languages,Welsh,1075,95,0,1695
+Non-Official & Non-Aboriginal languages,Wolof,3990,1385,10,8240
+Aboriginal languages,Woods Cree,1840,800,75,2665
+Non-Official & Non-Aboriginal languages,Wu (Shanghainese),12915,7650,105,16530
+Non-Official & Non-Aboriginal languages,Yiddish,13555,7085,895,20985
+Non-Official & Non-Aboriginal languages,Yoruba,9080,2615,15,22415
+>>>>>>> dev

docs/GitHub.html

@@ -26,7 +26,7 @@
 <meta name="author" content="Melissa Lee" />
 
 
-<meta name="date" content="2020-11-03" />
+<meta name="date" content="2020-11-24" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />