Code

Tidy initial docs PR#2

Code

Merged

kallewesterling merged 133 commits intokallewesterling:adding-docstringskallewesterling/seshat:adding-docstringsfrom edwardchalstrey1:adding-docstringsedwardchalstrey1/seshat:adding-docstringsCopy head branch name to clipboardJun 26, 2024

+5,556-726

Commits

Commits on May 24, 2024

• supress current borders spinner

  edwardchalstrey1

  committed
  df53cdc

  Copy full SHA for df53cdc

• stop loading wheel after one year loaded

  edwardchalstrey1

  committed
  0a37c30

  Copy full SHA for 0a37c30

• bring back loading indicator when adjusting the year if not all polities loaded

  edwardchalstrey1

  committed
  70c2eb4

  Copy full SHA for 70c2eb4

• reload world_map_one_year multiple times

  edwardchalstrey1

  committed
  b3c4732

  Copy full SHA for b3c4732

Commits on May 28, 2024

• made the option to add suc and prec pols more userfriendly

  MajidBenam

  committed
  ae5fbfc

  Copy full SHA for ae5fbfc

Commits on May 31, 2024

• update gitignore to allow notebooks

  edwardchalstrey1

  committed
  07503fb

  Copy full SHA for 07503fb

• initial setup

  edwardchalstrey1

  committed
  c658042

  Copy full SHA for c658042

Commits on Jun 3, 2024

• note

  edwardchalstrey1

  committed
  ddd9d50

  Copy full SHA for ddd9d50

• specify 3.11

  edwardchalstrey1

  committed
  e4ca9ba

  Copy full SHA for e4ca9ba

• jupyter kernel instructions

  edwardchalstrey1

  committed
  2550efa

  Copy full SHA for 2550efa

• basic notebook works

  edwardchalstrey1

  committed
  ba76735

  Copy full SHA for ba76735

• colours

  edwardchalstrey1

  committed
  4a86dad

  Copy full SHA for 4a86dad

• remove extra cells

  edwardchalstrey1

  committed
  725437d

  Copy full SHA for 725437d

• translucent fill

  edwardchalstrey1

  committed
  59ddce9

  Copy full SHA for 59ddce9

• add end years

  edwardchalstrey1

  committed
  f113e92

  Copy full SHA for f113e92

• load shapes for a particular year

  edwardchalstrey1

  committed
  eb64d49

  Copy full SHA for eb64d49

• map function

  edwardchalstrey1

  committed
  90c4ea3

  Copy full SHA for 90c4ea3

• use whole world map limits

  edwardchalstrey1

  committed
  daef20f

  Copy full SHA for daef20f

• finish prev commit

  edwardchalstrey1

  committed
  a64d349

  Copy full SHA for a64d349

• add gadm

  edwardchalstrey1

  committed
  041ce53

  Copy full SHA for 041ce53

• use cartodb basemap

  edwardchalstrey1

  committed
  fa01014

  Copy full SHA for fa01014

• adjust coordinates properly for basemap

  edwardchalstrey1

  committed
  9041fbd

  Copy full SHA for 9041fbd

• use folium

  edwardchalstrey1

  committed
  c8dd5e4

  Copy full SHA for c8dd5e4

• zoom folium map correctly

  edwardchalstrey1

  committed
  47661b2

  Copy full SHA for 47661b2

• separate by colours properly

  edwardchalstrey1

  committed
  0061b49

  Copy full SHA for 0061b49

• add a widget for the year

  edwardchalstrey1

  committed
  9e65ff6

  Copy full SHA for 9e65ff6

• add slider

  edwardchalstrey1

  committed
  cb0f8f4

  Copy full SHA for cb0f8f4

• made the insertion of descriptions more user friendly

  MajidBenam

  committed
  c02f98f

  Copy full SHA for c02f98f

• add play button non functional

  edwardchalstrey1

  committed
  8543b70

  Copy full SHA for 8543b70

• play button works

  edwardchalstrey1

  committed
  63b2e97

  Copy full SHA for 63b2e97

• create python functions script

  edwardchalstrey1

  committed
  3c04f11

  Copy full SHA for 3c04f11

• move create_map to script

  edwardchalstrey1

  committed
  ed95c89

  Copy full SHA for ed95c89

• remove play button bits for now

  edwardchalstrey1

  committed
  76acff4

  Copy full SHA for 76acff4

• accept duplicate plots for now

  edwardchalstrey1

  committed
  53769c6

  Copy full SHA for 53769c6

Commits on Jun 4, 2024

• add popup

  edwardchalstrey1

  committed
  18dd38a

  Copy full SHA for 18dd38a

• use same logic as populate_videodata

  edwardchalstrey1

  committed
  aa4cab8

  Copy full SHA for aa4cab8

• remove unused import

  edwardchalstrey1

  committed
  d9fc1d0

  Copy full SHA for d9fc1d0

• separate out the convert_name func

  edwardchalstrey1

  committed
  d0c5f70

  Copy full SHA for d0c5f70

• update comment

  edwardchalstrey1

  committed
  4fe4401

  Copy full SHA for 4fe4401

• combine style_function into create_map

  edwardchalstrey1

  committed
  6e2a2e3

  Copy full SHA for 6e2a2e3

• restore style_function

  edwardchalstrey1

  committed
  22d18b1

  Copy full SHA for 22d18b1

• add DisplayName to the gdf

  edwardchalstrey1

  committed
  d0c9d01

  Copy full SHA for d0c9d01

• remove gadm and play/pause bits

  edwardchalstrey1

  committed
  c51378c

  Copy full SHA for c51378c

• create display_map function

  edwardchalstrey1

  committed
  aed92d3

  Copy full SHA for aed92d3

Commits on Jun 5, 2024

• speed up get_polity_shape_content for loop

  edwardchalstrey1

  committed
  e81869c

  Copy full SHA for e81869c

• ignore deprecated simplified_geom

  edwardchalstrey1

  committed
  87f4c4d

  Copy full SHA for 87f4c4d

• big processing speedup but breaks personal union code

  edwardchalstrey1

  committed
  fe28a12

  Copy full SHA for fe28a12

• remove prints

  edwardchalstrey1

  committed
  3b8ba62

  Copy full SHA for 3b8ba62

• change geom to geom_json in tests

  edwardchalstrey1

  committed
  aae22b0

  Copy full SHA for aae22b0

• temp disable hanging test

  edwardchalstrey1

  committed
  f087eac

  Copy full SHA for f087eac

• create self.geo_square string manually

  edwardchalstrey1

  committed
  52b8884

  Copy full SHA for 52b8884

• do things the old way for gadm

  edwardchalstrey1

  committed
  ef399c6

  Copy full SHA for ef399c6

• speed assign_variables_to_shapes from 3.38 to 2.88 s

  edwardchalstrey1

  committed
  4fe8c49

  Copy full SHA for 4fe8c49

Commits on Jun 6, 2024

• dont run random_polity_shape when testing

  edwardchalstrey1

  committed
  5d7be8a

  Copy full SHA for 5d7be8a

• remove console logs

  edwardchalstrey1

  committed
  47ccace

  Copy full SHA for 47ccace

• Merge branch 'adjust-loading-2' into processing-speedups

  edwardchalstrey1

  committed
  7411a21

  Copy full SHA for 7411a21

• dont load variables for first set of shapes for one year - but this means they lack the colours later

  edwardchalstrey1

  committed
  d716ab5

  Copy full SHA for d716ab5

• Revert "dont load variables for first set of shapes for one year - but this means they lack the colours later"

  Show description for 39a8d4b
  edwardchalstrey1

  committed
  39a8d4b

  Copy full SHA for 39a8d4b

• better way to handle unions

  edwardchalstrey1

  committed
  4c2c07e

  Copy full SHA for 4c2c07e

• remove timers

  edwardchalstrey1

  committed
  27be8b3

  Copy full SHA for 27be8b3

• Merge pull request #159 from edwardchalstrey1/processing-speedups

  Show description for 1b81c26
  edwardchalstrey1

  authored
  1b81c26

  Copy full SHA for 1b81c26

• Fix multipass setup in docs

  Show description for 2ad9489
  kallewesterling

  committed
  2ad9489

  Copy full SHA for 2ad9489

• Switch from pg_restore to psql in macOS instructions

  Show description for 23d6c18
  kallewesterling

  committed
  23d6c18

  Copy full SHA for 23d6c18

Commits on Jun 7, 2024

• added the new religion tolerance lis_all style and the description addition

  MajidBenam

  committed
  7aa32a6

  Copy full SHA for 7aa32a6

Commits on Jun 18, 2024

• Merge pull request #161 from kallewesterling/kallewesterling/issue158

  Show description for 8963fa9
  edwardchalstrey1

  authored
  8963fa9

  Copy full SHA for 8963fa9

• Merge pull request #162 from kallewesterling/kallewesterling/issue160

  Show description for 830f81c
  edwardchalstrey1

  authored
  830f81c

  Copy full SHA for 830f81c

• Merge branch 'dev' into clio-notebook

  edwardchalstrey1

  committed
  56bdbfa

  Copy full SHA for 56bdbfa

• Area not Area_Km2

  edwardchalstrey1

  committed
  ba19701

  Copy full SHA for ba19701

• only simplify if you want to

  edwardchalstrey1

  committed
  88bf793

  Copy full SHA for 88bf793

• works with geopandas==0.13.2

  edwardchalstrey1

  committed
  b6b31c1

  Copy full SHA for b6b31c1

• geopandas instructions

  edwardchalstrey1

  committed
  828f000

  Copy full SHA for 828f000

• Merge pull request #167 from edwardchalstrey1/clio-notebook

  Show description for c129011
  edwardchalstrey1

  authored
  c129011

  Copy full SHA for c129011

Commits on Jun 19, 2024

• use duration when start or end year missing for absent present vars

  edwardchalstrey1

  committed
  e5d65b5

  Copy full SHA for e5d65b5

• rename var

  edwardchalstrey1

  committed
  7182987

  Copy full SHA for 7182987

• format BCE/CE correctly

  edwardchalstrey1

  committed
  9f7e513

  Copy full SHA for 9f7e513

• make uncoded and no seshat page the same colour

  edwardchalstrey1

  committed
  10ecec7

  Copy full SHA for 10ecec7

• make switch variable button consistent

  edwardchalstrey1

  committed
  434f886

  Copy full SHA for 434f886

• add speed in y/s

  edwardchalstrey1

  committed
  dbbbc13

  Copy full SHA for dbbbc13

• simplify instructions

  edwardchalstrey1

  committed
  0e662f3

  Copy full SHA for 0e662f3

• update polity map playRate to be same as world map

  edwardchalstrey1

  committed
  a03693f

  Copy full SHA for a03693f

• set minZoom

  edwardchalstrey1

  committed
  6066bb1

  Copy full SHA for 6066bb1

• restrict map bounds

  edwardchalstrey1

  committed
  cfb886e

  Copy full SHA for cfb886e

• move year slider to bottom of polity map

  edwardchalstrey1

  committed
  3dba145

  Copy full SHA for 3dba145

• add tickmarks

  edwardchalstrey1

  committed
  d276b4f

  Copy full SHA for d276b4f

• Revert "add tickmarks"

  Show description for b48fbcf
  edwardchalstrey1

  committed
  b48fbcf

  Copy full SHA for b48fbcf

• add a middle year to tickmarks

  edwardchalstrey1

  committed
  61f6441

  Copy full SHA for 61f6441

• restore 10 tickmarks

  edwardchalstrey1

  committed
  8e84a83

  Copy full SHA for 8e84a83

• added ticks badly positioned

  edwardchalstrey1

  committed
  9ee279a

  Copy full SHA for 9ee279a

• correct number of tickmarks

  edwardchalstrey1

  committed
  dc3c90a

  Copy full SHA for dc3c90a

Commits on Jun 21, 2024

• tickmarks are accurate but labels don't line up neatly

  edwardchalstrey1

  committed
  27cfaf4

  Copy full SHA for 27cfaf4

• center tick values

  edwardchalstrey1

  committed
  6bfc52b

  Copy full SHA for 6bfc52b

• ticks perfect

  edwardchalstrey1

  committed
  3840371

  Copy full SHA for 3840371

• move year controls to left

  edwardchalstrey1

  committed
  910cb12

  Copy full SHA for 910cb12

• adjust header and year

  edwardchalstrey1

  committed
  b48c45f

  Copy full SHA for b48c45f

• rearrange controls

  edwardchalstrey1

  committed
  389641e

  Copy full SHA for 389641e

• move year into fieldset

  edwardchalstrey1

  committed
  6f1566f

  Copy full SHA for 6f1566f

• put slider below map

  edwardchalstrey1

  committed
  187a7c1

  Copy full SHA for 187a7c1

• fix width issues

  edwardchalstrey1

  committed
  1df3aa2

  Copy full SHA for 1df3aa2

• create setSliderTicks func

  edwardchalstrey1

  committed
  2675b8e

  Copy full SHA for 2675b8e

• works for world map all years but not initial

  edwardchalstrey1

  committed
  dc02dd8

  Copy full SHA for dc02dd8

Commits on Jun 24, 2024

• put slider at bottom of world map

  edwardchalstrey1

  committed
  dd3cfd2

  Copy full SHA for dd3cfd2

• add tick_number as an arg

  edwardchalstrey1

  committed
  d7a13b9

  Copy full SHA for d7a13b9

• update tests to include tick_years

  edwardchalstrey1

  committed
  9b3c8fd

  Copy full SHA for 9b3c8fd

• remove print

  edwardchalstrey1

  committed
  858d3ee

  Copy full SHA for 858d3ee

• use tick_years from django

  edwardchalstrey1

  committed
  5aae546

  Copy full SHA for 5aae546

• set default tick_number to 20, but 10 for polity map

  edwardchalstrey1

  committed
  2cd74ff

  Copy full SHA for 2cd74ff

• set slider ticks in world map

  edwardchalstrey1

  committed
  fde5b2c

  Copy full SHA for fde5b2c

• update ticks once everything loaded

  edwardchalstrey1

  committed
  e604491

  Copy full SHA for e604491

• add override_latest_year

  edwardchalstrey1

  committed
  40f3d26

  Copy full SHA for 40f3d26

• show initial ticks

  edwardchalstrey1

  committed
  a0760b5

  Copy full SHA for a0760b5

• add comment

  edwardchalstrey1

  committed
  bbaa7d7

  Copy full SHA for bbaa7d7

• hide slider before all polities loaded

  edwardchalstrey1

  committed
  38f9c17

  Copy full SHA for 38f9c17

• fix display year

  edwardchalstrey1

  committed
  5e8f302

  Copy full SHA for 5e8f302

• restore slider initially

  edwardchalstrey1

  committed
  bdf39f7

  Copy full SHA for bdf39f7

• improve text

  edwardchalstrey1

  committed
  82a6b95

  Copy full SHA for 82a6b95

• make previous variable button smaller

  edwardchalstrey1

  committed
  4c2598d

  Copy full SHA for 4c2598d

• reduce side panel width

  edwardchalstrey1

  committed
  3c537bc

  Copy full SHA for 3c537bc

• put year at top

  edwardchalstrey1

  committed
  623168d

  Copy full SHA for 623168d

• move speed to centre

  edwardchalstrey1

  committed
  f6a4063

  Copy full SHA for f6a4063

• increase size of polity map window

  edwardchalstrey1

  committed
  4c53760

  Copy full SHA for 4c53760

• Merge pull request #170 from edwardchalstrey1/aesthetics-19-June

  Show description for 919c706
  edwardchalstrey1

  authored
  919c706

  Copy full SHA for 919c706

Commits on Jun 25, 2024

• change gadm fill colour to white

  edwardchalstrey1

  committed
  6b593c3

  Copy full SHA for 6b593c3

• Merge branch 'Qing' into Qing-merge-25june

  edwardchalstrey1

  committed
  9f1fcaa

  Copy full SHA for 9f1fcaa

• Merge pull request #174 from edwardchalstrey1/Qing-merge-25june

  Show description for 509f316
  edwardchalstrey1

  authored
  509f316

  Copy full SHA for 509f316

Commits on Jun 26, 2024

• link to pulumi docs

  edwardchalstrey1

  committed
  4eedf06

  Copy full SHA for 4eedf06

• refactor pulumi stack setup doc

  edwardchalstrey1

  committed
  63a01a4

  Copy full SHA for 63a01a4

• de-duplicate pulumi stack info

  edwardchalstrey1

  committed
  48c03f0

  Copy full SHA for 48c03f0

• improve virtual env suggestion

  edwardchalstrey1

  committed
  21ead0a

  Copy full SHA for 21ead0a

• fix rst link

  edwardchalstrey1

  committed
  305ecf3

  Copy full SHA for 305ecf3

• remove hint as link wasn't working

  edwardchalstrey1

  committed
  caf3f61

  Copy full SHA for caf3f61

• update spatialdb link again

  edwardchalstrey1

  committed
  1a1b90d

  Copy full SHA for 1a1b90d

• restore hint and fix link by adding underscore

  edwardchalstrey1

  committed
  09d519f

  Copy full SHA for 09d519f

• Merge branch 'dev' into adding-docstrings

  edwardchalstrey1

  committed
  7eb62c1

  Copy full SHA for 7eb62c1