diff --git a/.ruby-version b/.ruby-version index 57cf282..ff365e0 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.5 +3.1.3 diff --git a/Gemfile.lock b/Gemfile.lock index c1bb7cd..e925972 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,49 +1,47 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.6) + activesupport (7.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.11.1) colorator (1.1.0) - commonmarker (0.17.13) - ruby-enum (~> 0.5) - concurrent-ruby (1.1.8) - dnsruby (1.61.5) - simpleidn (~> 0.1) - em-websocket (0.5.2) + commonmarker (0.23.10) + concurrent-ruby (1.2.2) + dnsruby (1.70.0) + simpleidn (~> 0.2.1) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - ethon (0.12.0) - ffi (>= 1.3.0) + http_parser.rb (~> 0) + ethon (0.16.0) + ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.7.0) - faraday (1.3.0) - faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords - faraday-net_http (1.0.1) - ffi (1.15.0) + execjs (2.8.1) + faraday (2.7.10) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (214) - github-pages-health-check (= 1.17.0) - jekyll (= 3.9.0) + github-pages (228) + github-pages-health-check (= 1.17.9) + jekyll (= 3.9.3) jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.1.6) + jekyll-commonmark-ghpages (= 0.4.0) jekyll-default-layout (= 0.1.4) jekyll-feed (= 0.15.1) jekyll-gist (= 1.5.0) jekyll-github-metadata (= 2.13.0) + jekyll-include-cache (= 0.2.1) jekyll-mentions (= 1.6.0) jekyll-optional-front-matter (= 0.3.2) jekyll-paginate (= 1.1.0) @@ -52,49 +50,49 @@ GEM jekyll-relative-links (= 0.6.1) jekyll-remote-theme (= 0.4.3) jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.7.1) + jekyll-seo-tag (= 2.8.0) jekyll-sitemap (= 1.4.0) jekyll-swiss (= 1.0.0) - jekyll-theme-architect (= 0.1.1) - jekyll-theme-cayman (= 0.1.1) - jekyll-theme-dinky (= 0.1.1) - jekyll-theme-hacker (= 0.1.2) - jekyll-theme-leap-day (= 0.1.1) - jekyll-theme-merlot (= 0.1.1) - jekyll-theme-midnight (= 0.1.1) - jekyll-theme-minimal (= 0.1.1) - jekyll-theme-modernist (= 0.1.1) - jekyll-theme-primer (= 0.5.4) - jekyll-theme-slate (= 0.1.1) - jekyll-theme-tactile (= 0.1.1) - jekyll-theme-time-machine (= 0.1.1) + jekyll-theme-architect (= 0.2.0) + jekyll-theme-cayman (= 0.2.0) + jekyll-theme-dinky (= 0.2.0) + jekyll-theme-hacker (= 0.2.0) + jekyll-theme-leap-day (= 0.2.0) + jekyll-theme-merlot (= 0.2.0) + jekyll-theme-midnight (= 0.2.0) + jekyll-theme-minimal (= 0.2.0) + jekyll-theme-modernist (= 0.2.0) + jekyll-theme-primer (= 0.6.0) + jekyll-theme-slate (= 0.2.0) + jekyll-theme-tactile (= 0.2.0) + jekyll-theme-time-machine (= 0.2.0) jekyll-titles-from-headings (= 0.5.3) jemoji (= 0.12.0) - kramdown (= 2.3.1) + kramdown (= 2.3.2) kramdown-parser-gfm (= 1.1.0) - liquid (= 4.0.3) + liquid (= 4.0.4) mercenary (~> 0.3) minima (= 2.5.1) - nokogiri (>= 1.10.4, < 2.0) + nokogiri (>= 1.13.6, < 2.0) rouge (= 3.26.0) terminal-table (~> 1.4) - github-pages-health-check (1.17.0) + github-pages-health-check (1.17.9) addressable (~> 2.3) dnsruby (~> 1.60) octokit (~> 4.0) - public_suffix (>= 2.0.2, < 5.0) + public_suffix (>= 3.0, < 5.0) typhoeus (~> 1.3) - html-pipeline (2.14.0) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) - http_parser.rb (0.6.0) - i18n (0.9.5) + http_parser.rb (0.8.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jekyll (3.9.0) + jekyll (3.9.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) + i18n (>= 0.7, < 2) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 2.0) kramdown (>= 1.17, < 3) @@ -108,13 +106,13 @@ GEM jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) - jekyll-commonmark (1.3.1) - commonmarker (~> 0.14) - jekyll (>= 3.7, < 5.0) - jekyll-commonmark-ghpages (0.1.6) - commonmarker (~> 0.17.6) - jekyll-commonmark (~> 1.2) - rouge (>= 2.0, < 4.0) + jekyll-commonmark (1.4.0) + commonmarker (~> 0.22) + jekyll-commonmark-ghpages (0.4.0) + commonmarker (~> 0.23.7) + jekyll (~> 3.9.0) + jekyll-commonmark (~> 1.4.0) + rouge (>= 2.0, < 5.0) jekyll-default-layout (0.1.4) jekyll (~> 3.0) jekyll-feed (0.15.1) @@ -124,6 +122,8 @@ GEM jekyll-github-metadata (2.13.0) jekyll (>= 3.4, < 5.0) octokit (~> 4.0, != 4.4.0) + jekyll-include-cache (0.2.1) + jekyll (>= 3.7, < 5.0) jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) @@ -143,50 +143,50 @@ GEM rubyzip (>= 1.3.0, < 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.7.1) + jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-swiss (1.0.0) - jekyll-theme-architect (0.1.1) - jekyll (~> 3.5) + jekyll-theme-architect (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-cayman (0.1.1) - jekyll (~> 3.5) + jekyll-theme-cayman (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-dinky (0.1.1) - jekyll (~> 3.5) + jekyll-theme-dinky (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.1.2) + jekyll-theme-hacker (0.2.0) jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-leap-day (0.1.1) - jekyll (~> 3.5) + jekyll-theme-leap-day (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-merlot (0.1.1) - jekyll (~> 3.5) + jekyll-theme-merlot (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-midnight (0.1.1) - jekyll (~> 3.5) + jekyll-theme-midnight (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-minimal (0.1.1) - jekyll (~> 3.5) + jekyll-theme-minimal (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-modernist (0.1.1) - jekyll (~> 3.5) + jekyll-theme-modernist (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-primer (0.5.4) + jekyll-theme-primer (0.6.0) jekyll (> 3.5, < 5.0) jekyll-github-metadata (~> 2.9) jekyll-seo-tag (~> 2.0) - jekyll-theme-slate (0.1.1) - jekyll (~> 3.5) + jekyll-theme-slate (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-tactile (0.1.1) - jekyll (~> 3.5) + jekyll-theme-tactile (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-time-machine (0.1.1) - jekyll (~> 3.5) + jekyll-theme-time-machine (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) jekyll-titles-from-headings (0.5.3) jekyll (>= 3.3, < 5.0) @@ -196,64 +196,59 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.3.1) + kramdown (2.3.2) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) - listen (3.5.1) + liquid (4.0.4) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.5.1) + mini_portile2 (2.8.4) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.14.4) - multipart-post (2.1.1) - nokogiri (1.11.4) - mini_portile2 (~> 2.5.0) + minitest (5.19.0) + nokogiri (1.15.3) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - octokit (4.20.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.6) - racc (1.5.2) - rb-fsevent (0.10.4) + public_suffix (4.0.7) + racc (1.7.1) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.5) + rexml (3.2.6) rouge (3.26.0) - ruby-enum (0.9.0) - i18n - ruby2_keywords (0.0.4) - rubyzip (2.3.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) + faraday (>= 0.17.3, < 3) simpleidn (0.2.1) unf (~> 0.1.4) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) - zeitwerk (2.4.2) + unf_ext (0.0.8.2) + unicode-display_width (1.8.0) PLATFORMS ruby diff --git a/source/about/index.md b/source/about/index.md index cafd291..c17c34b 100644 --- a/source/about/index.md +++ b/source/about/index.md @@ -4,23 +4,6 @@ title: About The UK Python Association permalink: /about/ --- -The UK Python Association (UKPA) is a Charitable Incorporated Organisation (Registered Charity 1173471) registered in England and Wales. - -[Its constitution lives on GitHub](https://github.com/UKPythonAssociation/ukpa-constitution). - -Its current trustees are: - -* Tania Allard -* Owen Campbell -* Kristian Glass -* Vincent Knight -* Cecilia Liao -* David Spademan - -For previous trustees see [Trustees](/about/trustees/). - -To contact the trustees, please email [trustees@uk.python.org](mailto:trustees@uk.python.org). - For information about the history of the UKPA, see [History](/about/history/). [UKPA Internal Documentation](https://ukpa-internaldocs.readthedocs.io/en/latest/). diff --git a/source/about/trustees.md b/source/about/trustees.md deleted file mode 100644 index 445a965..0000000 --- a/source/about/trustees.md +++ /dev/null @@ -1,73 +0,0 @@ ---- -layout: page -title: Trustees ---- - -The current Trustees are: - -* Tania Allard -* Owen Campbell -* Kristian Glass -* Vincent Knight -* Cecilia Liao -* David Spademan - -## 2019 - -The 2019 AGM was held at PyCon UK 2019, at which: - -* Owen Campbell was required to retire by the constitution as the longest serving elected trustee -* Owen Campbell stood for re-election and was re-elected -* Vincent Knight and David Spademan stood for election and were elected - -At the end of October 2019, Daniele Procida resigned as Conference Director and the elected trustees appointed Kristian Glass as his replacement. - - -## 2018 - -In May 2018, Nicholas Tollervey resigned as a trustee. - -The 2018 AGM was held at PyCon UK 2018, at which: - -* Peter Inglesby and Kristian Glass were required to retire by the constitution, as two of the longest-serving elected trustees -* Kristian Glass stood for re-election and was re-elected -* Tania Allard and Cecilia Liao stood for election and were elected - -At the conclusion of the 2018 AGM, the trustees were: - -* Cecilia Liao -* Chloe Parkes -* Daniele Procida -* Kirk Northrop -* Kristian Glass -* Owen Campbell -* Tania Allard - -In October 2018, Chloe Parkes resigned as a trustee. - -In November 2018, Kirk Northrop resigned as a trustee. - - -## 2017 - -The UKPA was registered on 19-Jun-2017. Its founding trustees were: - -* Owen Campbell -* Kristian Glass -* Peter Inglesby - -The elected trustees of the UKPA were decided at the first AGM of the UK Python Association, held at PyCon UK 2017. -They were: - -* Chloe Parkes -* Kirk Northrop -* Kristian Glass -* Nicholas Tollervey -* Owen Campbell -* Peter Inglesby - -One further trustee, -the Conference Director, -is appointed by the elected trustees and, -at their first trustees meeting on 29th October 2017, -they appointed Daniele Procida who thus became the seventh Trustee. diff --git a/source/contact/index.md b/source/contact/index.md deleted file mode 100644 index f3c8c0f..0000000 --- a/source/contact/index.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -layout: page -title: Get Involved -permalink: /contact/ ---- - -The UKPA maintains a node on the [Matrix network](https://matrix.org/). - -To connect with us, choose your preferred [Matrix client](https://matrix.org/docs/projects/try-matrix-now), register an account on a node of your choice (matrix.org or one from the [unofficial list](https://www.hello-matrix.net/public_servers.php)) and join our community discussion room at #community:uk.python.org - -Alternatively, you can also [contact the trustees via email](mailto:trustees@uk.python.org). diff --git a/source/index.md b/source/index.md index cfd80e6..31176e9 100644 --- a/source/index.md +++ b/source/index.md @@ -3,7 +3,7 @@ layout: page title: The UK Python Association --- -The UK Python Association (UKPA) is a Charitable Incorporated Organisation (Registered Charity [1173471](http://beta.charitycommission.gov.uk/charity-details/?regid=1173471&subid=0)) registered in England and Wales. +The UK Python Association (UKPA) is a Charitable Incorporated Organisation ([Registered Charity 1173471](https://register-of-charities.charitycommission.gov.uk/en/charity-search/-/charity-details/5101629)) registered in England and Wales. Its objects are: @@ -11,10 +11,32 @@ Its objects are: > (a) Organising, presenting and promoting Python related conferences, meetings and events at venues within the UK, > (b) Supporting and promoting Python related projects and events organised by UKPA members, and, > (c) Supporting UKPA members wishing to attend Python related conferences, meetings and events. -> 2. To advance education for the public benefit in the use and understanding of the Python programming language worldwise by supporting and promoting overseas Python related conferences, meetings and events. +> 2. To advance education for the public benefit in the use and understanding of the Python programming language worldwide by supporting and promoting overseas Python related conferences, meetings and events. -It is the organisation behind [PyCon UK](http://pyconuk.org). +It is the organisation behind [PyCon UK](https://pyconuk.org). * [More about the UKPA](/about/) -* [PyCon UK](http://pyconuk.org) +* [PyCon UK](https://pyconuk.org) * [Get involved](/contact/) + +## Get Involved + +To get involved with the UKPA or PyCon UK, please [contact the trustees via email](mailto:trustees@uk.python.org)! + +## About the UKPA + +The UK Python Association constitution can be [found on GitHub](https://github.com/UKPythonAssociation/ukpa-constitution). + +The current trustees are: + +* Owen Campbell +* Kristian Glass +* Providence Onyenekwe +* Becky Smith +* Adam Turner + +To contact the trustees, please email [trustees@uk.python.org](mailto:trustees@uk.python.org). + +For information about the history of the UKPA, see [History](/about/history/). + +[UKPA Internal Documentation](https://ukpa-internaldocs.readthedocs.io/). diff --git a/source/well_known/matrix/client b/source/well_known/matrix/client deleted file mode 100644 index 64a89d2..0000000 --- a/source/well_known/matrix/client +++ /dev/null @@ -1,12 +0,0 @@ ---- -layout: none -permalink: /.well-known/matrix/client ---- -{ - "m.homeserver": { - "base_url": "https://ukpa.modular.im" - }, - "m.identity_server": { - "base_url": "https://vector.im" - } -} diff --git a/source/well_known/matrix/server b/source/well_known/matrix/server deleted file mode 100644 index 6d90ab7..0000000 --- a/source/well_known/matrix/server +++ /dev/null @@ -1,7 +0,0 @@ ---- -layout: none -permalink: /.well-known/matrix/server ---- -{ - "m.server": "ukpa.modular.im:443" -}