Skip to content

Commit 3f7e642

Browse files
authored
Merge branch 'main' into goc_jvm_v2
2 parents f84b317 + 78cb323 commit 3f7e642

233 files changed

Lines changed: 36698 additions & 233 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,33 @@ _site/
3636
.calva/mcp-server/port
3737
.portal/vs-code.edn
3838
**/password.edn
39-
/src/finance/portfolio_analysis/*.edn
39+
/src/finance/portfolio_analysis/*.edn# Created by https://www.toptal.com/developers/gitignore/api/osx
40+
41+
# Edit at https://www.toptal.com/developers/gitignore?templates=osx
42+
43+
### OSX ###
44+
# General
45+
.DS_Store
46+
.AppleDouble
47+
.LSOverride
48+
49+
# Thumbnails
50+
#._*
51+
52+
# Files that might appear in the root of a volume
53+
.DocumentRevisions-V100
54+
.fseventsd
55+
.Spotlight-V100
56+
.TemporaryItems
57+
.Trashes
58+
.VolumeIcon.icns
59+
.com.apple.timemachine.donotpresent
60+
61+
# Directories potentially created on remote AFP share
62+
.AppleDB
63+
.AppleDesktop
64+
Network Trash Folder
65+
Temporary Items
66+
.apdisk
67+
68+
# End of https://www.toptal.com/developers/gitignore/api/osx

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
<img src="src/images/civitas-icon.svg" alt="Civitas Icon" align="right">
44

5-
Clojure Civitas makes it easy for you to publish Clojure ideas and explorations
6-
without the overhead of setting up a new project, blog, or repo.
5+
Clojure Civitas is a shared [blog](https://clojurecivitas.github.io/posts.html) space for your ideas and explorations.
6+
Clojure Civitas makes it easy for you to publish Clojure ideas and explorations without the overhead of setting up a new project, blog, or repo.
77
Whether you're sketching out a quick experiment or writing a deeper post,
8-
just fork this repo, create a namespace, write, commit and submit a pull request.
8+
just fork this repo, add a namespace, write, commit and submit a pull request.
99
This is your shared scratch space.
1010

1111
Think. Code. Share.
@@ -138,6 +138,8 @@ clojure -M:clay -A:markdown
138138
quarto preview site
139139
```
140140

141+
(`bb site-preview` will run these two commands for you.)
142+
141143
This will open a browser displaying the site locally.
142144

143145
If you would like to preview a single file, then add the path relative to `src`:

bb.edn

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{:tasks
2+
{preview
3+
{:doc "Build site with Quarto and preview"
4+
:task (do (clojure "-M:clay -A:markdown")
5+
(shell "quarto preview site"))}}}

deps.edn

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{:paths ["src"]
22

33
:deps
4-
{org.clojure/clojure {:mvn/version "1.12.1"}
4+
{org.clojure/clojure {:mvn/version "1.12.3"}
55
org.scicloj/noj {:mvn/version "2-beta18"}
6+
;; Tableplot can be removed after updating Noj:
7+
org.scicloj/tableplot {:mvn/version "1-beta14"}
68
markdown-clj/markdown-clj {:mvn/version "1.12.4"}
79
org.clojure/core.async {:mvn/version "1.9.808-alpha1"}
810
io.github.clojure/core.async.flow-monitor {:git/tag "v0.1.2"
@@ -11,9 +13,8 @@
1113
metosin/malli {:mvn/version "0.19.1"}
1214
clj-fuzzy/clj-fuzzy {:mvn/version "0.4.1"}
1315
clj-thamil/clj-thamil {:mvn/version "0.2.0"}
14-
org.scicloj/clay {#_#_:mvn/version "2-beta54"
15-
:git/url "https://github.com/scicloj/clay.git"
16-
:git/sha "26fb97b5ea2f72a98f8a64d5b8b8abf705767a39"}
16+
org.scicloj/clay {:mvn/version "2.0.2"}
17+
org.scicloj/kindly {:mvn/version "4-beta21"}
1718
thi.ng/geom {:mvn/version "1.0.1"}
1819
org.eclipse.elk/org.eclipse.elk.core {:mvn/version "0.10.0"}
1920
org.eclipse.elk/org.eclipse.elk.graph {:mvn/version "0.10.0"}
@@ -38,16 +39,32 @@
3839
org.lwjgl/lwjgl-stb$natives-linux {:mvn/version "3.3.6"}
3940
org.lwjgl/lwjgl-stb$natives-windows {:mvn/version "3.3.6"}
4041
org.lwjgl/lwjgl-stb$natives-macos {:mvn/version "3.3.6"}
41-
generateme/fastmath {:mvn/version "3.0.0-alpha3"}
42-
clj-http/clj-http {:mvn/version "3.13.1"}
42+
43+
4344
;; libraries for GIS work
4445
org.apache.sis.storage/sis-geotiff {:mvn/version "1.5"}
4546
org.apache.sis.core/sis-referencing {:mvn/version "1.5"}
4647
org.geotools/gt-geotiff {:mvn/version "31.2"}
4748
org.geotools/gt-main {:mvn/version "31.2"}
4849
org.geotools/gt-epsg-hsql {:mvn/version "31.2"}
49-
org.geotools/gt-geojson {:mvn/version "31.2"}}
50+
org.geotools/gt-geojson {:mvn/version "31.2"}
51+
52+
53+
clj-http/clj-http {:mvn/version "3.13.1"}
54+
55+
generateme/fastmath {:mvn/version "3.0.0-alpha4"}
56+
clojure2d/clojure2d {:mvn/version "1.5.0-alpha1"}
57+
58+
com.github.psambit9791/jdsp {:mvn/version "3.1.0"}
5059

60+
org.soulspace/qclojure {:mvn/version "0.22.0"}
61+
org.babashka/http-client {:mvn/version "0.4.22"}
62+
com.github.danielsz/bioscoop {:mvn/version "1.0.5"}
63+
yamlscript/core {:git/url "https://github.com/yaml/yamlscript"
64+
:git/sha "ed7adfbf90a39f379d5a7193bb2e4bdd7f0eecf8"
65+
:deps/root "core"}
66+
}
67+
5168
:mvn/repos {"osgeo" {:url "https://repo.osgeo.org/repository/release/"}}
5269

5370
:aliases

site/_quarto.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
project:
22
type: website
3+
resources:
4+
- "*.cljs"
5+
- "*.svg"
6+
- "*.png"
37

48
website:
59
title: "Clojure Civitas"
@@ -27,6 +31,7 @@ format:
2731
light: [ flatly, brand, styles.scss, styles-light.scss ]
2832
dark: [ darkly, brand, styles.scss, styles-dark.scss ]
2933
respect-user-color-scheme: true
34+
lightbox: true
3035
include-in-header:
3136
- text: |
3237
<script data-goatcounter="https://clojurecivitas.goatcounter.com/count" async src="//gc.zgo.at/count.js"></script>

site/conferences/conj2025/workshop/scicloj/buzz.qmd

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
---
22
author:
3-
- name: Ethan Miller
4-
image: https://avatars.githubusercontent.com/u/772738?v=4
5-
url: https://github.com/ezmiller
3+
- name: Timothy Pratley
4+
url: https://timothypratley.blogspot.com/p/httpswww.html
5+
image: https://avatars.githubusercontent.com/u/49298?v=4
6+
email: timothypratley@gmail.com
67
affiliation:
7-
- {name: Scicloj, url: 'https://scicloj.github.io/'}
8+
- {name: Hummi, url: 'https://hummi.app'}
9+
links:
10+
- {icon: github, href: 'https://github.com/timothypratley'}
811
description: Getting to know our host city for Clojure/conj 2025. We dive into 311 service data to see what's on the minds of Charlotte's citizens and get a taste of our hands-on data analysis workshop.
912
type: post
10-
date: '2025-08-15'
13+
date: '2025-11-10'
1114
category: conj
1215
tags: [clay, workflow, conj]
13-
draft: true
16+
image: charlotte.png
1417
format:
1518
html: {title: 'What''s the Buzz in Charlotte? A Pre-Conj Data Dive'}
1619

@@ -23,10 +26,10 @@ format:
2326
.clay-side-by-side .sourceCode {margin: 0}
2427
.clay-side-by-side {margin: 1em 0}
2528
</style>
26-
<script src="buzz_files/md-default0.js" type="text/javascript"></script><script src="buzz_files/md-default1.js" type="text/javascript"></script><script src="buzz_files/plotly2.js" type="text/javascript"></script>
29+
<script src="https://code.jquery.com/jquery-3.6.0.min.js" type="text/javascript"></script><script src="https://code.jquery.com/ui/1.13.1/jquery-ui.min.js" type="text/javascript"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/plotly.js/2.20.0/plotly.min.js" type="text/javascript"></script>
2730
This November 12th, Clojure enthusiasts will gather in **Charlotte, North Carolina**
2831
for Clojure/conj 2025.
29-
For many of us, it's a cherished yearly tradition of code,
32+
It's a cherished yearly conference of code,
3033
conversations, and that special *"this is my people"* feeling.
3134

3235
::: {.callout-note}
@@ -36,16 +39,14 @@ That same spirit of passionate engagement seems to live on in the city's civic l
3639
on display using the hornet as their city emblem.
3740
:::
3841

39-
In the spirit of exploration that defines our community, let's get to know our host city
40-
before we even arrive.
42+
In the spirit of exploration, let's get to know our host city before we arrive.
4143
What can 3 million service requests tell us about the heart of Charlotte?
4244

4345

44-
## A Glimpse into Charlotte's Data
46+
## Charlotte's Data
4547

46-
Let's find out by diving into the city's 311 system, which captures the pulse
47-
of city life through non-emergency service requests.
48-
Every pothole report, noise complaint, and fallen tree notification tells a story.
48+
Let's find out by diving into the city's 311 system; non-emergency service requests.
49+
Every pothole report, noise complaint, and fallen tree notification gets recorded.
4950

5051
Downloaded from [Charlotte Service Requests](https://data.charlottenc.gov/datasets/charlotte::service-requests-311/explore?location=35.265099%2C-80.810750%2C9.72).
5152

@@ -223,8 +224,7 @@ Data like this helps cities improve their communication and services.
223224

224225

225226
```{=html}
226-
<div style="height:auto;width:100%;"><script>Plotly.newPlot(document.currentScript.parentElement,
227-
[{"y":[1542623,366433,147023,69893,56694,52972,46761,32594,30048,26465,25145,24900,24268,23914,20396,20359,20121,18946,17301,16702,16495,16012,15404,14337,14259,13106,12496,10876,10659,10616,10461,9922,9117,8710,8601,8286,8255,8243,8128,8057,7749,7528,7266,7264,6936,6355,6249,6019,5467,5301,5124,4967,4879,4431,4355,4055,3939,3836,3723,3559,3480,3248,3200,3003,2957,2823,2700,2663,2592,2592,2518,2392,2321,2187,2175,1874,1643,1630,1598,1440,1431,1365,1335,1325,1248,1211,1136,1045,1043,1001,983,977,971,969,929,870,836,835,816,794,790,785,785,677,564,509,478,476,441,406,368,364,351,331,278,264,250,228,225,219,214,210,208,185,180,151,128,125,113,105,100,89,82,74,68,63,61,60,53,51,43,41,39,37,33,29,28,28,27,22,18,15,15,15,12,11,10,9,9,8,8,6,5,4,4,2,2,2,1,1,1,1,1,1,1],"r":null,"name":"","fill":null,"mode":null,"width":null,"type":"bar","theta":null,"z":null,"lon":null,"lat":null,"text":null}], {"width":500,"height":400,"margin":{"t":25},"automargin":false,"plot_bgcolor":"rgb(235,235,235)","xaxis":{"gridcolor":"rgb(255,255,255)","title":"Request Type","showgrid":true},"yaxis":{"gridcolor":"rgb(255,255,255)","title":"Count","showgrid":true},"title":"Charlotte 311 Service Requests"}, {});</script></div>
227+
<div style="height:auto;width:100%;"><script>Plotly.newPlot(document.currentScript.parentElement, [{"y":[1542623,366433,147023,69893,56694,52972,46761,32594,30048,26465,25145,24900,24268,23914,20396,20359,20121,18946,17301,16702,16495,16012,15404,14337,14259,13106,12496,10876,10659,10616,10461,9922,9117,8710,8601,8286,8255,8243,8128,8057,7749,7528,7266,7264,6936,6355,6249,6019,5467,5301,5124,4967,4879,4431,4355,4055,3939,3836,3723,3559,3480,3248,3200,3003,2957,2823,2700,2663,2592,2592,2518,2392,2321,2187,2175,1874,1643,1630,1598,1440,1431,1365,1335,1325,1248,1211,1136,1045,1043,1001,983,977,971,969,929,870,836,835,816,794,790,785,785,677,564,509,478,476,441,406,368,364,351,331,278,264,250,228,225,219,214,210,208,185,180,151,128,125,113,105,100,89,82,74,68,63,61,60,53,51,43,41,39,37,33,29,28,28,27,22,18,15,15,15,12,11,10,9,9,8,8,6,5,4,4,2,2,2,1,1,1,1,1,1,1],"r":null,"name":"","fill":null,"mode":null,"width":null,"type":"bar","theta":null,"z":null,"lon":null,"lat":null,"text":null}], {"width":500,"height":400,"margin":{"t":25},"automargin":false,"plot_bgcolor":"rgb(235,235,235)","xaxis":{"gridcolor":"rgb(255,255,255)","title":"Request Type","showgrid":true},"yaxis":{"gridcolor":"rgb(255,255,255)","title":"Count","showgrid":true},"title":"Charlotte 311 Service Requests"}, {});</script></div>
228228
```
229229

230230

@@ -247,8 +247,7 @@ Let's focus on the top 5.
247247

248248

249249
```{=html}
250-
<div style="height:auto;width:100%;"><script>Plotly.newPlot(document.currentScript.parentElement,
251-
[{"y":[1542623,366433,147023,69893,56694],"r":null,"name":"","fill":null,"mode":null,"width":null,"type":"bar","theta":null,"z":null,"lon":null,"lat":null,"x":["NON_RECYCLABLE ITEMS","RECYCLABLE ITEMS","HNS HEALTH AND SANITATION","CART REPAIR-GARBAGE","MISSED RECYCLING"],"text":null}], {"width":500,"height":400,"margin":{"t":25},"automargin":false,"plot_bgcolor":"rgb(235,235,235)","xaxis":{"gridcolor":"rgb(255,255,255)","title":"Request Type","showgrid":true},"yaxis":{"gridcolor":"rgb(255,255,255)","title":"Count","showgrid":true},"title":"Charlotte 311 Service Requests"}, {});</script></div>
250+
<div style="height:auto;width:100%;"><script>Plotly.newPlot(document.currentScript.parentElement, [{"y":[1542623,366433,147023,69893,56694],"r":null,"name":"","fill":null,"mode":null,"width":null,"type":"bar","theta":null,"z":null,"lon":null,"lat":null,"x":["NON_RECYCLABLE ITEMS","RECYCLABLE ITEMS","HNS HEALTH AND SANITATION","CART REPAIR-GARBAGE","MISSED RECYCLING"],"text":null}], {"width":500,"height":400,"margin":{"t":25},"automargin":false,"plot_bgcolor":"rgb(235,235,235)","xaxis":{"gridcolor":"rgb(255,255,255)","title":"Request Type","showgrid":true},"yaxis":{"gridcolor":"rgb(255,255,255)","title":"Count","showgrid":true},"title":"Charlotte 311 Service Requests"}, {});</script></div>
252251
```
253252

254253

@@ -261,9 +260,9 @@ kind of thoughtful problem-solving we cherish in the Clojure community.
261260

262261
## Join Us at the Workshop
263262

264-
This journey from a raw CSV file to a clear visualization is exactly what our
263+
This journey from a raw CSV file to a clear visualization is exactly what the
265264
**Empowering Data Analysis through SciCloj** [workshop](https://www.2025.clojure-conj.org/workshops) is all about.
266-
Led by me, Ethan Miller, you'll start your Conj experience by diving into practical,
265+
You'll start your Conj experience by diving into practical,
267266
hands-on data analysis and come away with new ideas to carry back home.
268267

269268
**You will learn how to:**
@@ -273,7 +272,8 @@ hands-on data analysis and come away with new ideas to carry back home.
273272
- Share your insights through interactive notebooks
274273
- Leverage Clojure's immutable data structures for data science
275274

276-
We can't wait to explore data with you. See you in Charlotte!
275+
We can't wait to explore data with you.
276+
See you in Charlotte!
277277

278278

279279
```{=html}

0 commit comments

Comments
 (0)