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 69d1302..e925972 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,43 +1,42 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.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.8.1) + 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.23.6) - concurrent-ruby (1.1.10) - dnsruby (1.61.9) - simpleidn (~> 0.1) + 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) - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) eventmachine (1.2.7) execjs (2.8.1) - faraday (2.5.2) + faraday (2.7.10) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.0) + faraday-net_http (3.0.2) ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (227) + github-pages (228) github-pages-health-check (= 1.17.9) - jekyll (= 3.9.2) + jekyll (= 3.9.3) jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.2.0) + jekyll-commonmark-ghpages (= 0.4.0) jekyll-default-layout (= 0.1.4) jekyll-feed (= 0.15.1) jekyll-gist (= 1.5.0) @@ -71,7 +70,7 @@ GEM jemoji (= 0.12.0) 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.13.6, < 2.0) @@ -83,17 +82,17 @@ GEM octokit (~> 4.0) public_suffix (>= 3.0, < 5.0) typhoeus (~> 1.3) - html-pipeline (2.14.2) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (0.9.5) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jekyll (3.9.2) + 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) @@ -109,11 +108,11 @@ GEM coffee-script-source (~> 1.11.1) jekyll-commonmark (1.4.0) commonmarker (~> 0.22) - jekyll-commonmark-ghpages (0.2.0) - commonmarker (~> 0.23.4) + jekyll-commonmark-ghpages (0.4.0) + commonmarker (~> 0.23.7) jekyll (~> 3.9.0) jekyll-commonmark (~> 1.4.0) - rouge (>= 2.0, < 4.0) + rouge (>= 2.0, < 5.0) jekyll-default-layout (0.1.4) jekyll (~> 3.0) jekyll-feed (0.15.1) @@ -201,19 +200,19 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) - listen (3.7.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.8.0) + 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.16.3) - nokogiri (1.13.9) - mini_portile2 (~> 2.8.0) + minitest (5.19.0) + nokogiri (1.15.3) + mini_portile2 (~> 2.8.2) racc (~> 1.4) octokit (4.25.1) faraday (>= 1, < 3) @@ -221,11 +220,11 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.7) - racc (1.6.0) + 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) ruby2_keywords (0.0.5) rubyzip (2.3.2) @@ -242,16 +241,14 @@ GEM 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.10) - thread_safe (~> 0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) unicode-display_width (1.8.0) - zeitwerk (2.6.0) PLATFORMS ruby diff --git a/source/about/index.md b/source/about/index.md index 9902f4a..c17c34b 100644 --- a/source/about/index.md +++ b/source/about/index.md @@ -4,22 +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 -* Ann Barr -* Owen Campbell -* Kristian Glass -* Vincent Knight -* Gail Ollis -* Becky Smith - -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/contact/index.md b/source/contact/index.md deleted file mode 100644 index f48846c..0000000 --- a/source/contact/index.md +++ /dev/null @@ -1,15 +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, you can either follow this [invitation link](https://matrix.to/#/!PxQLUASvEmbvzsdrmS:uk.python.org?via=matrix.org) or: - -1. Choose a [matrix client](https://matrix.org/clients/). Element is the best known and has desktop, mobile and browser versions. -2. Register an account on a matrix node. matrix.org is the best known open node but there are [many others](https://www.hello-matrix.net/public_servers.php). -3. Join our main room. Its address is #community:uk.python.org - -Alternatively, you can [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" -}