From a87ec3b9ec86a13b39095401a2792909624bd817 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 8 Dec 2025 21:27:20 -0800 Subject: [PATCH 1/4] Fork stackprof and concurrent-ruby for deprecated API --- benchmarks/activerecord/Gemfile | 1 + benchmarks/activerecord/Gemfile.lock | 10 ++++++++-- benchmarks/erubi-rails/Gemfile | 1 + benchmarks/erubi-rails/Gemfile.lock | 10 ++++++++-- benchmarks/fluentd/Gemfile | 1 + benchmarks/fluentd/Gemfile.lock | 10 ++++++++-- benchmarks/lobsters/Gemfile | 3 ++- benchmarks/lobsters/Gemfile.lock | 22 +++++++++++++++++----- benchmarks/railsbench/Gemfile | 3 ++- benchmarks/railsbench/Gemfile.lock | 22 +++++++++++++++++----- benchmarks/rubocop/Gemfile | 1 + benchmarks/rubocop/Gemfile.lock | 10 ++++++++-- benchmarks/shipit/Gemfile | 1 + benchmarks/shipit/Gemfile.lock | 10 ++++++++-- 14 files changed, 83 insertions(+), 22 deletions(-) diff --git a/benchmarks/activerecord/Gemfile b/benchmarks/activerecord/Gemfile index b62e12cc..54c4eab0 100644 --- a/benchmarks/activerecord/Gemfile +++ b/benchmarks/activerecord/Gemfile @@ -5,3 +5,4 @@ gem "activerecord-jdbcsqlite3-adapter", "~> 70", platform: :jruby gem "mutex_m" gem "bigdecimal" gem "base64" +gem "concurrent-ruby", github: "ruby-concurrency/concurrent-ruby" diff --git a/benchmarks/activerecord/Gemfile.lock b/benchmarks/activerecord/Gemfile.lock index 2c453fc7..3a33539f 100644 --- a/benchmarks/activerecord/Gemfile.lock +++ b/benchmarks/activerecord/Gemfile.lock @@ -1,3 +1,9 @@ +GIT + remote: https://github.com/ruby-concurrency/concurrent-ruby.git + revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb + specs: + concurrent-ruby (1.3.5) + GEM remote: https://rubygems.org/ specs: @@ -22,7 +28,6 @@ GEM uri (>= 0.13.1) base64 (0.3.0) bigdecimal (3.3.1) - concurrent-ruby (1.3.5) connection_pool (3.0.2) drb (2.2.3) i18n (1.14.7) @@ -50,6 +55,7 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter (~> 70) base64 bigdecimal + concurrent-ruby! mutex_m sqlite3 @@ -59,7 +65,7 @@ CHECKSUMS activesupport (8.1.1) sha256=5e92534e8d0c8b8b5e6b16789c69dbea65c1d7b752269f71a39422e9546cea67 base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b bigdecimal (3.3.1) sha256=eaa01e228be54c4f9f53bf3cc34fe3d5e845c31963e7fcc5bedb05a4e7d52218 - concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6 + concurrent-ruby (1.3.5) connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373 i18n (1.14.7) sha256=ceba573f8138ff2c0915427f1fc5bdf4aa3ab8ae88c8ce255eb3ecf0a11a5d0f diff --git a/benchmarks/erubi-rails/Gemfile b/benchmarks/erubi-rails/Gemfile index 5ab971f9..a2fb3427 100644 --- a/benchmarks/erubi-rails/Gemfile +++ b/benchmarks/erubi-rails/Gemfile @@ -39,6 +39,7 @@ gem 'jbuilder', '~> 2.7' #gem 'bootsnap', '>= 1.4.4', require: false gem 'mutex_m' +gem 'concurrent-ruby', github: 'ruby-concurrency/concurrent-ruby' group :development do # Access an interactive console on exception pages or by calling 'console' anywhere in the code. diff --git a/benchmarks/erubi-rails/Gemfile.lock b/benchmarks/erubi-rails/Gemfile.lock index 78d198bb..66ce2edb 100644 --- a/benchmarks/erubi-rails/Gemfile.lock +++ b/benchmarks/erubi-rails/Gemfile.lock @@ -1,3 +1,9 @@ +GIT + remote: https://github.com/ruby-concurrency/concurrent-ruby.git + revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb + specs: + concurrent-ruby (1.3.5) + GEM remote: https://rubygems.org/ specs: @@ -59,7 +65,6 @@ GEM xpath (~> 3.2) cgi (0.5.0) childprocess (4.1.0) - concurrent-ruby (1.3.5) connection_pool (2.5.3) crass (1.0.6) date (3.4.1) @@ -210,6 +215,7 @@ DEPENDENCIES bigdecimal capybara (>= 3.26) cgi + concurrent-ruby! jbuilder (~> 2.7) mutex_m net-imap (~> 0.2.1) @@ -240,7 +246,7 @@ CHECKSUMS capybara (3.40.0) sha256=42dba720578ea1ca65fd7a41d163dd368502c191804558f6e0f71b391054aeef cgi (0.5.0) sha256=fe99f65bb2c146e294372ebb27602adbc3b4c008e9ea7038c6bd48c1ec9759da childprocess (4.1.0) sha256=3616ce99ccb242361ce7f2b19bf9ff3e6bc1d98b927c7edc29af8ca617ba6cd3 - concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6 + concurrent-ruby (1.3.5) connection_pool (2.5.3) sha256=cfd74a82b9b094d1ce30c4f1a346da23ee19dc8a062a16a85f58eab1ced4305b crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d date (3.4.1) sha256=bf268e14ef7158009bfeaec40b5fa3c7271906e88b196d958a89d4b408abe64f diff --git a/benchmarks/fluentd/Gemfile b/benchmarks/fluentd/Gemfile index 9696d7ea..eeb6625b 100644 --- a/benchmarks/fluentd/Gemfile +++ b/benchmarks/fluentd/Gemfile @@ -4,3 +4,4 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gem 'csv' gem 'fluentd' gem 'base64' +gem 'concurrent-ruby', github: 'ruby-concurrency/concurrent-ruby' diff --git a/benchmarks/fluentd/Gemfile.lock b/benchmarks/fluentd/Gemfile.lock index 715c9ed5..2b8c0349 100644 --- a/benchmarks/fluentd/Gemfile.lock +++ b/benchmarks/fluentd/Gemfile.lock @@ -1,3 +1,9 @@ +GIT + remote: https://github.com/ruby-concurrency/concurrent-ruby.git + revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb + specs: + concurrent-ruby (1.3.5) + GEM remote: https://rubygems.org/ specs: @@ -20,7 +26,6 @@ GEM async-pool (0.11.0) async (>= 2.0) base64 (0.3.0) - concurrent-ruby (1.3.5) console (1.33.0) fiber-annotation fiber-local (~> 1.1) @@ -90,6 +95,7 @@ PLATFORMS DEPENDENCIES base64 + concurrent-ruby! csv fluentd @@ -98,7 +104,7 @@ CHECKSUMS async-http (0.89.0) sha256=1a40728cf38ec4c3eff121474bd4f218237ffff177e471ca677b57d7aa436682 async-pool (0.11.0) sha256=2228c4a8d1ca59a259b5f9dab7e0f9f23d57856b195aca1c0aa684a7439ea525 base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b - concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6 + concurrent-ruby (1.3.5) console (1.33.0) sha256=a1cc1910e3b24169b4925e42d72da414d53e5bd6773aee9a811e57dfe0399384 cool.io (1.9.1) sha256=2001bfec1b87ad5e87c0eb9f197a6ee6f1a0433ddba04002227da6ee8b74c6c1 csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f diff --git a/benchmarks/lobsters/Gemfile b/benchmarks/lobsters/Gemfile index 7c51ad85..b8014b36 100644 --- a/benchmarks/lobsters/Gemfile +++ b/benchmarks/lobsters/Gemfile @@ -22,6 +22,7 @@ gem 'scenic' #gem 'scenic-mysql_adapter' gem "activerecord-typedstore" gem 'sprockets-rails', '2.3.3' +gem 'concurrent-ruby', github: 'ruby-concurrency/concurrent-ruby' # js gem "jquery-rails", "~> 4.3" @@ -52,7 +53,7 @@ group :development do gem 'flamegraph' gem 'memory_profiler' gem 'rack-mini-profiler' - gem 'stackprof' + gem 'stackprof', github: 'nobu/stackprof', branch: 'postponed_jobs' end gem "oauth" # for twitter-posting bot diff --git a/benchmarks/lobsters/Gemfile.lock b/benchmarks/lobsters/Gemfile.lock index fe961086..9fd532b6 100644 --- a/benchmarks/lobsters/Gemfile.lock +++ b/benchmarks/lobsters/Gemfile.lock @@ -1,3 +1,16 @@ +GIT + remote: https://github.com/nobu/stackprof.git + revision: 7d4b181569c04c9a35d0b4250cfbc535760ac18d + branch: postponed_jobs + specs: + stackprof (0.2.27) + +GIT + remote: https://github.com/ruby-concurrency/concurrent-ruby.git + revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb + specs: + concurrent-ruby (1.3.5) + GIT remote: https://github.com/ianks/commonmarker.git revision: 6ea4f5a2be0423206dbaeca7108035a70a149ab7 @@ -115,7 +128,6 @@ GEM xpath (~> 3.2) cgi (0.5.0) chunky_png (1.4.0) - concurrent-ruby (1.3.5) connection_pool (3.0.2) crack (1.0.0) bigdecimal @@ -314,7 +326,6 @@ GEM sprockets (>= 2.8, < 4.0) sqlite3 (2.7.3) mini_portile2 (~> 2.8.0) - stackprof (0.2.27) stringio (3.1.7) svg-graph (2.2.2) thor (1.4.0) @@ -360,6 +371,7 @@ DEPENDENCIES capybara cgi commonmarker! + concurrent-ruby! database_cleaner factory_bot_rails faker @@ -390,7 +402,7 @@ DEPENDENCIES sitemap_generator sprockets-rails (= 2.3.3) sqlite3 - stackprof + stackprof! svg-graph vcr webmock @@ -421,7 +433,7 @@ CHECKSUMS cgi (0.5.0) sha256=fe99f65bb2c146e294372ebb27602adbc3b4c008e9ea7038c6bd48c1ec9759da chunky_png (1.4.0) sha256=89d5b31b55c0cf4da3cf89a2b4ebc3178d8abe8cbaf116a1dba95668502fdcfe commonmarker (2.6.1) - concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6 + concurrent-ruby (1.3.5) connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a crack (1.0.0) sha256=c83aefdb428cdc7b66c7f287e488c796f055c0839e6e545fec2c7047743c4a49 crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d @@ -516,7 +528,7 @@ CHECKSUMS sprockets (3.7.5) sha256=72c20f256548f8a37fe7db41d96be86c3262fddaf4ebe9d69ec8317394fed383 sprockets-rails (2.3.3) sha256=968794c910cc395ae10a68e3d4f5801f946b7698103e42ed49f7cad67d3654ef sqlite3 (2.7.3) sha256=d2b2fecd9341132f2cea3fde9061ee0fab9c9d532a8ecccfab4fe63d9621bf57 - stackprof (0.2.27) sha256=aff6d28656c852e74cf632cc2046f849033dc1dedffe7cb8c030d61b5745e80c + stackprof (0.2.27) stringio (3.1.7) sha256=5b78b7cb242a315fb4fca61a8255d62ec438f58da2b90be66048546ade4507fa svg-graph (2.2.2) sha256=f928866403055e6539afdfdab5f6268d108b2abc9f002e0fc51b16511809513a thor (1.4.0) sha256=8763e822ccb0f1d7bee88cde131b19a65606657b847cc7b7b4b82e772bcd8a3d diff --git a/benchmarks/railsbench/Gemfile b/benchmarks/railsbench/Gemfile index ec052cdc..524c83fe 100644 --- a/benchmarks/railsbench/Gemfile +++ b/benchmarks/railsbench/Gemfile @@ -18,7 +18,7 @@ end gem 'sprockets-rails', '3.2.2' -gem 'stackprof', platforms: :mri +gem 'stackprof', platforms: :mri, github: 'nobu/stackprof', branch: 'postponed_jobs' # Use sqlite3 as the database for Active Record gem 'sqlite3', platform: :ruby gem 'activerecord-jdbcsqlite3-adapter', '~> 70', platform: :jruby @@ -28,6 +28,7 @@ gem 'webrick', '~> 1.8.2' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # Needed in the benchmark for json responses gem 'jbuilder', '~> 2.7' +gem 'concurrent-ruby', github: 'ruby-concurrency/concurrent-ruby' # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker # gem 'webpacker', '~> 4.0' diff --git a/benchmarks/railsbench/Gemfile.lock b/benchmarks/railsbench/Gemfile.lock index 4e55cc26..26187011 100644 --- a/benchmarks/railsbench/Gemfile.lock +++ b/benchmarks/railsbench/Gemfile.lock @@ -1,3 +1,16 @@ +GIT + remote: https://github.com/nobu/stackprof.git + revision: 7d4b181569c04c9a35d0b4250cfbc535760ac18d + branch: postponed_jobs + specs: + stackprof (0.2.27) + +GIT + remote: https://github.com/ruby-concurrency/concurrent-ruby.git + revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb + specs: + concurrent-ruby (1.3.5) + GEM remote: https://rubygems.org/ specs: @@ -73,7 +86,6 @@ GEM bigdecimal (3.3.1) builder (3.3.0) cgi (0.5.0) - concurrent-ruby (1.3.5) connection_pool (3.0.2) crass (1.0.6) digest (3.2.0) @@ -167,7 +179,6 @@ GEM sqlite3 (2.7.3) mini_portile2 (~> 2.8.0) sqlite3 (2.7.3-x86_64-linux-gnu) - stackprof (0.2.27) strscan (3.1.5) thor (1.4.0) timeout (0.4.3) @@ -198,6 +209,7 @@ DEPENDENCIES base64 bigdecimal cgi + concurrent-ruby! jbuilder (~> 2.7) mutex_m net-imap (~> 0.2.1) @@ -206,7 +218,7 @@ DEPENDENCIES railties (~> 8.0) sprockets-rails (= 3.2.2) sqlite3 - stackprof + stackprof! tzinfo-data webrick (~> 1.8.2) @@ -226,7 +238,7 @@ CHECKSUMS bigdecimal (3.3.1) sha256=eaa01e228be54c4f9f53bf3cc34fe3d5e845c31963e7fcc5bedb05a4e7d52218 builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f cgi (0.5.0) sha256=fe99f65bb2c146e294372ebb27602adbc3b4c008e9ea7038c6bd48c1ec9759da - concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6 + concurrent-ruby (1.3.5) connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d digest (3.2.0) sha256=fa2e7092ec683f65d82fadde5ff4ca3b32e23ee0b19f1fc1a5e09993ad2d3991 @@ -270,7 +282,7 @@ CHECKSUMS sprockets-rails (3.2.2) sha256=62862bce136e31d7497eededde5f7730d4096bc8ef33ef7037c41423ccf89557 sqlite3 (2.7.3) sha256=d2b2fecd9341132f2cea3fde9061ee0fab9c9d532a8ecccfab4fe63d9621bf57 sqlite3 (2.7.3-x86_64-linux-gnu) sha256=11b2612fddf56602d238be7a984fa0633e591edd034f7520747bc0927b7fa865 - stackprof (0.2.27) sha256=aff6d28656c852e74cf632cc2046f849033dc1dedffe7cb8c030d61b5745e80c + stackprof (0.2.27) strscan (3.1.5) sha256=f8413b90ea9395a69609a4414a8c88551bcda64337e234272c24fcd4c83e5947 thor (1.4.0) sha256=8763e822ccb0f1d7bee88cde131b19a65606657b847cc7b7b4b82e772bcd8a3d timeout (0.4.3) sha256=9509f079b2b55fe4236d79633bd75e34c1c1e7e3fb4b56cb5fda61f80a0fe30e diff --git a/benchmarks/rubocop/Gemfile b/benchmarks/rubocop/Gemfile index 1c2f187c..b1d992a2 100644 --- a/benchmarks/rubocop/Gemfile +++ b/benchmarks/rubocop/Gemfile @@ -6,3 +6,4 @@ gem "parser", ">= 3.2.2.3" # Avoid a fun ruby-lsp/rubocop bug gem "rubocop" gem "rubocop-performance" gem "rubocop-rails" +gem "concurrent-ruby", github: "ruby-concurrency/concurrent-ruby" diff --git a/benchmarks/rubocop/Gemfile.lock b/benchmarks/rubocop/Gemfile.lock index c948bff7..6f90af76 100644 --- a/benchmarks/rubocop/Gemfile.lock +++ b/benchmarks/rubocop/Gemfile.lock @@ -1,3 +1,9 @@ +GIT + remote: https://github.com/ruby-concurrency/concurrent-ruby.git + revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb + specs: + concurrent-ruby (1.3.5) + GEM remote: https://rubygems.org/ specs: @@ -18,7 +24,6 @@ GEM base64 (0.3.0) benchmark (0.4.1) bigdecimal (3.2.2) - concurrent-ruby (1.3.5) connection_pool (2.5.3) drb (2.2.3) i18n (1.14.7) @@ -75,6 +80,7 @@ PLATFORMS x86_64-linux DEPENDENCIES + concurrent-ruby! parser (>= 3.2.2.3) rubocop rubocop-performance @@ -86,7 +92,7 @@ CHECKSUMS base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b benchmark (0.4.1) sha256=d4ef40037bba27f03b28013e219b950b82bace296549ec15a78016552f8d2cce bigdecimal (3.2.2) sha256=39085f76b495eb39a79ce07af716f3a6829bc35eb44f2195e2753749f2fa5adc - concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6 + concurrent-ruby (1.3.5) connection_pool (2.5.3) sha256=cfd74a82b9b094d1ce30c4f1a346da23ee19dc8a062a16a85f58eab1ced4305b drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373 i18n (1.14.7) sha256=ceba573f8138ff2c0915427f1fc5bdf4aa3ab8ae88c8ce255eb3ecf0a11a5d0f diff --git a/benchmarks/shipit/Gemfile b/benchmarks/shipit/Gemfile index b3c62ecc..bcb0d4a1 100644 --- a/benchmarks/shipit/Gemfile +++ b/benchmarks/shipit/Gemfile @@ -6,6 +6,7 @@ gem "rails", "~> 8.0.2" gem "sqlite3", ">= 2.1" # Use the Puma web server [https://github.com/puma/puma] gem "puma", ">= 5.0" +gem "concurrent-ruby", github: "ruby-concurrency/concurrent-ruby" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: %i[ windows jruby ] diff --git a/benchmarks/shipit/Gemfile.lock b/benchmarks/shipit/Gemfile.lock index 80ab9e9d..48099211 100644 --- a/benchmarks/shipit/Gemfile.lock +++ b/benchmarks/shipit/Gemfile.lock @@ -1,3 +1,9 @@ +GIT + remote: https://github.com/ruby-concurrency/concurrent-ruby.git + revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb + specs: + concurrent-ruby (1.3.5) + GEM remote: https://rubygems.org/ specs: @@ -97,7 +103,6 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.3.5) connection_pool (3.0.2) crass (1.0.6) date (3.5.1) @@ -383,6 +388,7 @@ PLATFORMS x86_64-linux DEPENDENCIES + concurrent-ruby! puma (>= 5.0) rails (~> 8.0.2) shipit-engine (>= 0.40.0) @@ -414,7 +420,7 @@ CHECKSUMS coffee-rails (5.0.0) sha256=5daaa1ba51fd4907c98a333b6a9e7c1a99b1fff57fcef999b6c62d813cb91a9c coffee-script (2.4.1) sha256=82fe281e11b93c8117b98c5ea8063e71741870f1c4fbb27177d7d6333dd38765 coffee-script-source (1.12.2) sha256=e12b16fd8927fbbf8b87cb2e9a85a6cf457c6881cc7ff8b1af15b31f70da07a4 - concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6 + concurrent-ruby (1.3.5) connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 From 8c881a68ee6bc22e461a1220a789a93da53617c8 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 26 Dec 2025 16:57:03 +0900 Subject: [PATCH 2/4] Refer the upstream revisions --- benchmarks/lobsters/Gemfile | 2 +- benchmarks/lobsters/Gemfile.lock | 3 +-- benchmarks/railsbench/Gemfile | 2 +- benchmarks/railsbench/Gemfile.lock | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/benchmarks/lobsters/Gemfile b/benchmarks/lobsters/Gemfile index b8014b36..325ba055 100644 --- a/benchmarks/lobsters/Gemfile +++ b/benchmarks/lobsters/Gemfile @@ -53,7 +53,7 @@ group :development do gem 'flamegraph' gem 'memory_profiler' gem 'rack-mini-profiler' - gem 'stackprof', github: 'nobu/stackprof', branch: 'postponed_jobs' + gem 'stackprof', github: 'tmm1/stackprof' end gem "oauth" # for twitter-posting bot diff --git a/benchmarks/lobsters/Gemfile.lock b/benchmarks/lobsters/Gemfile.lock index 9fd532b6..98082d07 100644 --- a/benchmarks/lobsters/Gemfile.lock +++ b/benchmarks/lobsters/Gemfile.lock @@ -1,7 +1,6 @@ GIT - remote: https://github.com/nobu/stackprof.git + remote: https://github.com/tmm1/stackprof.git revision: 7d4b181569c04c9a35d0b4250cfbc535760ac18d - branch: postponed_jobs specs: stackprof (0.2.27) diff --git a/benchmarks/railsbench/Gemfile b/benchmarks/railsbench/Gemfile index 524c83fe..46569794 100644 --- a/benchmarks/railsbench/Gemfile +++ b/benchmarks/railsbench/Gemfile @@ -18,7 +18,7 @@ end gem 'sprockets-rails', '3.2.2' -gem 'stackprof', platforms: :mri, github: 'nobu/stackprof', branch: 'postponed_jobs' +gem 'stackprof', platforms: :mri, github: 'tmm1/stackprof' # Use sqlite3 as the database for Active Record gem 'sqlite3', platform: :ruby gem 'activerecord-jdbcsqlite3-adapter', '~> 70', platform: :jruby diff --git a/benchmarks/railsbench/Gemfile.lock b/benchmarks/railsbench/Gemfile.lock index 26187011..5c303cec 100644 --- a/benchmarks/railsbench/Gemfile.lock +++ b/benchmarks/railsbench/Gemfile.lock @@ -1,7 +1,6 @@ GIT - remote: https://github.com/nobu/stackprof.git + remote: https://github.com/tmm1/stackprof.git revision: 7d4b181569c04c9a35d0b4250cfbc535760ac18d - branch: postponed_jobs specs: stackprof (0.2.27) From 44f98921d5cadbd9e1c1ddb034493a1470fca962 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 25 Dec 2025 15:48:51 +0900 Subject: [PATCH 3/4] Fork yajl-ruby for deprecated API --- benchmarks/fluentd/Gemfile | 1 + benchmarks/fluentd/Gemfile.lock | 109 +++++++++++++++++--------------- 2 files changed, 59 insertions(+), 51 deletions(-) diff --git a/benchmarks/fluentd/Gemfile b/benchmarks/fluentd/Gemfile index eeb6625b..5d66eef7 100644 --- a/benchmarks/fluentd/Gemfile +++ b/benchmarks/fluentd/Gemfile @@ -5,3 +5,4 @@ gem 'csv' gem 'fluentd' gem 'base64' gem 'concurrent-ruby', github: 'ruby-concurrency/concurrent-ruby' +gem 'yajl-ruby', github: 'brianmario/yajl-ruby' diff --git a/benchmarks/fluentd/Gemfile.lock b/benchmarks/fluentd/Gemfile.lock index 2b8c0349..a3f99f65 100644 --- a/benchmarks/fluentd/Gemfile.lock +++ b/benchmarks/fluentd/Gemfile.lock @@ -1,32 +1,39 @@ +GIT + remote: https://github.com/brianmario/yajl-ruby.git + revision: 875b92d9dece3bd6ab9e4abea476c765763539bd + specs: + yajl-ruby (1.4.3) + GIT remote: https://github.com/ruby-concurrency/concurrent-ruby.git - revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb + revision: 129cf004294af68ac53e53a2f1197621b303570a specs: - concurrent-ruby (1.3.5) + concurrent-ruby (1.3.6) GEM remote: https://rubygems.org/ specs: - async (2.24.0) + async (2.35.0) console (~> 1.29) fiber-annotation - io-event (~> 1.9) + io-event (~> 1.11) metrics (~> 0.12) - traces (~> 0.15) - async-http (0.89.0) + traces (~> 0.18) + async-http (0.92.1) async (>= 2.10.2) - async-pool (~> 0.9) + async-pool (~> 0.11) io-endpoint (~> 0.14) io-stream (~> 0.6) metrics (~> 0.12) protocol-http (~> 0.49) protocol-http1 (~> 0.30) protocol-http2 (~> 0.22) + protocol-url (~> 0.2) traces (~> 0.10) - async-pool (0.11.0) + async-pool (0.11.1) async (>= 2.0) base64 (0.3.0) - console (1.33.0) + console (1.34.2) fiber-annotation fiber-local (~> 1.1) json @@ -37,7 +44,7 @@ GEM fiber-local (1.1.0) fiber-storage fiber-storage (1.0.1) - fluentd (1.19.0) + fluentd (1.19.1) async-http (~> 0.86) base64 (~> 0.2) bundler @@ -45,8 +52,6 @@ GEM csv (~> 3.2) drb (~> 2.2) http_parser.rb (>= 0.5.1, < 0.9.0) - io-event (< 1.11.0) - io-stream (< 0.8.0) logger (~> 1.6) msgpack (>= 1.3.1, < 2.0.0) serverengine (>= 2.3.2, < 3.0.0) @@ -54,87 +59,89 @@ GEM strptime (>= 0.2.4, < 1.0.0) tzinfo (>= 1.0, < 3.0) tzinfo-data (~> 1.0) - uri (~> 1.0) + uri (~> 1.0, < 1.1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) zstd-ruby (~> 1.5) - http_parser.rb (0.8.0) - io-endpoint (0.15.2) - io-event (1.10.2) - io-stream (0.7.0) - json (2.13.2) + http_parser.rb (0.8.1) + io-endpoint (0.16.0) + io-event (1.14.2) + io-stream (0.11.1) + json (2.18.0) logger (1.7.0) - metrics (0.12.2) + metrics (0.15.0) msgpack (1.8.0) protocol-hpack (1.5.1) - protocol-http (0.51.0) - protocol-http1 (0.34.1) + protocol-http (0.56.1) + protocol-http1 (0.35.2) protocol-http (~> 0.22) - protocol-http2 (0.22.1) + protocol-http2 (0.23.0) protocol-hpack (~> 1.4) protocol-http (~> 0.47) + protocol-url (0.4.0) serverengine (2.4.0) base64 (~> 0.1) logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - traces (0.15.2) + traces (0.18.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2025.2) + tzinfo-data (1.2025.3) tzinfo (>= 1.0.0) - uri (1.0.3) - webrick (1.9.1) - yajl-ruby (1.4.3) - zstd-ruby (1.5.7.0) + uri (1.0.4) + webrick (1.9.2) + zstd-ruby (1.5.7.1) PLATFORMS + arm64-darwin-25 ruby - x86_64-linux DEPENDENCIES base64 concurrent-ruby! csv fluentd + yajl-ruby! CHECKSUMS - async (2.24.0) sha256=589d11ac6d5808da195ed5ac71f37afcab505855aa958bf5fc463a5469c34377 - async-http (0.89.0) sha256=1a40728cf38ec4c3eff121474bd4f218237ffff177e471ca677b57d7aa436682 - async-pool (0.11.0) sha256=2228c4a8d1ca59a259b5f9dab7e0f9f23d57856b195aca1c0aa684a7439ea525 + async (2.35.0) sha256=0f792ce968023677669fb8608d0b16585332247181ed5417b4ff45900201e834 + async-http (0.92.1) sha256=66db56854cd9173b2f4e3b55f6ba48e15021e316425f0275e310a1d9ab173d59 + async-pool (0.11.1) sha256=98e1583e199a75f7dc70f8e65fc8d0d3b28636c3f256595d43e206642ad8fbda base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b - concurrent-ruby (1.3.5) - console (1.33.0) sha256=a1cc1910e3b24169b4925e42d72da414d53e5bd6773aee9a811e57dfe0399384 + concurrent-ruby (1.3.6) + console (1.34.2) sha256=1c036abf606ccec83f9dc28f0c31710fe5936ffe7ba5d235ae2865590a482d58 cool.io (1.9.1) sha256=2001bfec1b87ad5e87c0eb9f197a6ee6f1a0433ddba04002227da6ee8b74c6c1 csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373 fiber-annotation (0.2.0) sha256=7abfadf1d119f508867d4103bf231c0354d019cc39a5738945dec2edadaf6c03 fiber-local (1.1.0) sha256=c885f94f210fb9b05737de65d511136ea602e00c5105953748aa0f8793489f06 fiber-storage (1.0.1) sha256=f48e5b6d8b0be96dac486332b55cee82240057065dc761c1ea692b2e719240e1 - fluentd (1.19.0) sha256=96530a9d5706dfd3672efea69270004756ea9ee44d7788113102798c345ed400 - http_parser.rb (0.8.0) sha256=5a0932f1fa82ce08a8516a2685d5a86031c000560f89946913c555a0697544be - io-endpoint (0.15.2) sha256=1e7e90bb683945288075b43ac505aba11460a281600236b5f8fbc210cf878f25 - io-event (1.10.2) sha256=abe043a317df429db3670c7c246c167eda190cb5e9b5c543b1691970c9c3a13e - io-stream (0.7.0) sha256=f80f46103828f43a554a2980f8bbce257e879ca6ff400f3f774bac09d9e325bd - json (2.13.2) sha256=02e1f118d434c6b230a64ffa5c8dee07e3ec96244335c392eaed39e1199dbb68 + fluentd (1.19.1) sha256=6b6e8408894cea64ce93c2b20b7f2f63788bf5a14c3233ca1c97e9ae0462c579 + http_parser.rb (0.8.1) sha256=9ae8df145b39aa5398b2f90090d651c67bd8e2ebfe4507c966579f641e11097a + io-endpoint (0.16.0) sha256=b5517d9d2cde28e32ef0b0e13d4422d172a093760f50aad244d50282e990a114 + io-event (1.14.2) sha256=b0a069190eafe86005c22f7464f744971b5bd82f153740d34e6ab49548d4f613 + io-stream (0.11.1) sha256=fa5f551fcff99581c1757b9d1cee2c37b124f07d2ca4f40b756a05ab9bd21b87 + json (2.18.0) sha256=b10506aee4183f5cf49e0efc48073d7b75843ce3782c68dbeb763351c08fd505 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - metrics (0.12.2) sha256=75caab08235dc2b3bb7440e00f64e8426b23b9caa94755d81cf9371fffa1e12a + metrics (0.15.0) sha256=61ded5bac95118e995b1bc9ed4a5f19bc9814928a312a85b200abbdac9039072 msgpack (1.8.0) sha256=e64ce0212000d016809f5048b48eb3a65ffb169db22238fb4b72472fecb2d732 protocol-hpack (1.5.1) sha256=6feca238b8078da1cd295677d6f306c6001af92d75fe0643d33e6956cbc3ad91 - protocol-http (0.51.0) sha256=da1c48c67b6f5bb3477f2475a56665f103ae13a89b77e20c62cc52c28e41ca21 - protocol-http1 (0.34.1) sha256=146532623e506f3cbe814a69411ca45477c29249dc92c945249ca3222a02eb88 - protocol-http2 (0.22.1) sha256=91966e7083e792e9b54fd5a62891a59078dfe8e1cf0162ce58b387db812ca768 + protocol-http (0.56.1) sha256=a2cf738967f417048c27f0beb37a976c54fedc6a2532d8d13e7454597dd294d1 + protocol-http1 (0.35.2) sha256=b47aded38cd08dc37e9ed9ac7a54dc7bfaffa6d088dfaf3b178e2ef42fc614e6 + protocol-http2 (0.23.0) sha256=bb7a782bb24a386cf475bc8cd6190bd28b392fcef943e06c8d8fce06cc3b2ba8 + protocol-url (0.4.0) sha256=64d4c03b6b51ad815ac6fdaf77a1d91e5baf9220d26becb846c5459dacdea9e1 serverengine (2.4.0) sha256=4a42a431f187fac9906834d1bacf00321e835b11bc7f7b8af5f9b5c8fbd246bc sigdump (0.2.5) sha256=bb706c1cce70458b285d2c3a57121e801ccb79f68be7f7377692eb40b5437242 strptime (0.2.5) sha256=98ed77ff7717a47387ba473614f478e78b162d70a64072fd71d54f547e079af9 - traces (0.15.2) sha256=d2547834b7248bb8c8f4f6532c6b9ba80ef8e2d6068ce16e7873575d7b802d81 + traces (0.18.2) sha256=80f1649cb4daace1d7174b81f3b3b7427af0b93047759ba349960cb8f315e214 tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b - tzinfo-data (1.2025.2) sha256=a92375a1fbb47d38fe88fd514c40a38cc8f97d168da2a6479f15185e86470939 - uri (1.0.3) sha256=e9f2244608eea2f7bc357d954c65c910ce0399ca5e18a7a29207ac22d8767011 - webrick (1.9.1) sha256=b42d3c94f166f3fb73d87e9b359def9b5836c426fc8beacf38f2184a21b2a989 - yajl-ruby (1.4.3) sha256=8c974d9c11ae07b0a3b6d26efea8407269b02e4138118fbe3ef0d2ec9724d1d2 - zstd-ruby (1.5.7.0) sha256=893819f6b95244ca8885c62f9b3be7edfbf604f055bdef0574f4ccca175e87db + tzinfo-data (1.2025.3) sha256=b546e2f1e5e5c40a0c619aafb24e30d3d6a128c2f689278f721b7286dd499562 + uri (1.0.4) sha256=34485d137c079f8753a0ca1d883841a7ba2e5fae556e3c30c2aab0dde616344b + webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 + yajl-ruby (1.4.3) + zstd-ruby (1.5.7.1) sha256=ded1fbf83afa32d613f28448a6d546129c578e5a9df3bd92f3f1e2542169fd21 BUNDLED WITH - 4.0.0 + 4.0.3 From 23005a3d726f19b0495fc2d51d69b5e18d6c41d5 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 9 Jan 2026 23:12:12 +0900 Subject: [PATCH 4/4] Update concurrent-ruby --- benchmarks/activerecord/Gemfile | 1 - benchmarks/activerecord/Gemfile.lock | 10 ++-------- benchmarks/erubi-rails/Gemfile | 1 - benchmarks/erubi-rails/Gemfile.lock | 10 ++-------- benchmarks/fluentd/Gemfile | 1 - benchmarks/fluentd/Gemfile.lock | 10 ++-------- benchmarks/lobsters/Gemfile | 1 - benchmarks/lobsters/Gemfile.lock | 15 +++++---------- benchmarks/railsbench/Gemfile | 1 - benchmarks/railsbench/Gemfile.lock | 15 +++++---------- benchmarks/rubocop/Gemfile | 1 - benchmarks/rubocop/Gemfile.lock | 10 ++-------- benchmarks/shipit/Gemfile | 1 - benchmarks/shipit/Gemfile.lock | 10 ++-------- 14 files changed, 20 insertions(+), 67 deletions(-) diff --git a/benchmarks/activerecord/Gemfile b/benchmarks/activerecord/Gemfile index 54c4eab0..b62e12cc 100644 --- a/benchmarks/activerecord/Gemfile +++ b/benchmarks/activerecord/Gemfile @@ -5,4 +5,3 @@ gem "activerecord-jdbcsqlite3-adapter", "~> 70", platform: :jruby gem "mutex_m" gem "bigdecimal" gem "base64" -gem "concurrent-ruby", github: "ruby-concurrency/concurrent-ruby" diff --git a/benchmarks/activerecord/Gemfile.lock b/benchmarks/activerecord/Gemfile.lock index 3a33539f..2c453fc7 100644 --- a/benchmarks/activerecord/Gemfile.lock +++ b/benchmarks/activerecord/Gemfile.lock @@ -1,9 +1,3 @@ -GIT - remote: https://github.com/ruby-concurrency/concurrent-ruby.git - revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb - specs: - concurrent-ruby (1.3.5) - GEM remote: https://rubygems.org/ specs: @@ -28,6 +22,7 @@ GEM uri (>= 0.13.1) base64 (0.3.0) bigdecimal (3.3.1) + concurrent-ruby (1.3.5) connection_pool (3.0.2) drb (2.2.3) i18n (1.14.7) @@ -55,7 +50,6 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter (~> 70) base64 bigdecimal - concurrent-ruby! mutex_m sqlite3 @@ -65,7 +59,7 @@ CHECKSUMS activesupport (8.1.1) sha256=5e92534e8d0c8b8b5e6b16789c69dbea65c1d7b752269f71a39422e9546cea67 base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b bigdecimal (3.3.1) sha256=eaa01e228be54c4f9f53bf3cc34fe3d5e845c31963e7fcc5bedb05a4e7d52218 - concurrent-ruby (1.3.5) + concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6 connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373 i18n (1.14.7) sha256=ceba573f8138ff2c0915427f1fc5bdf4aa3ab8ae88c8ce255eb3ecf0a11a5d0f diff --git a/benchmarks/erubi-rails/Gemfile b/benchmarks/erubi-rails/Gemfile index a2fb3427..5ab971f9 100644 --- a/benchmarks/erubi-rails/Gemfile +++ b/benchmarks/erubi-rails/Gemfile @@ -39,7 +39,6 @@ gem 'jbuilder', '~> 2.7' #gem 'bootsnap', '>= 1.4.4', require: false gem 'mutex_m' -gem 'concurrent-ruby', github: 'ruby-concurrency/concurrent-ruby' group :development do # Access an interactive console on exception pages or by calling 'console' anywhere in the code. diff --git a/benchmarks/erubi-rails/Gemfile.lock b/benchmarks/erubi-rails/Gemfile.lock index 66ce2edb..78d198bb 100644 --- a/benchmarks/erubi-rails/Gemfile.lock +++ b/benchmarks/erubi-rails/Gemfile.lock @@ -1,9 +1,3 @@ -GIT - remote: https://github.com/ruby-concurrency/concurrent-ruby.git - revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb - specs: - concurrent-ruby (1.3.5) - GEM remote: https://rubygems.org/ specs: @@ -65,6 +59,7 @@ GEM xpath (~> 3.2) cgi (0.5.0) childprocess (4.1.0) + concurrent-ruby (1.3.5) connection_pool (2.5.3) crass (1.0.6) date (3.4.1) @@ -215,7 +210,6 @@ DEPENDENCIES bigdecimal capybara (>= 3.26) cgi - concurrent-ruby! jbuilder (~> 2.7) mutex_m net-imap (~> 0.2.1) @@ -246,7 +240,7 @@ CHECKSUMS capybara (3.40.0) sha256=42dba720578ea1ca65fd7a41d163dd368502c191804558f6e0f71b391054aeef cgi (0.5.0) sha256=fe99f65bb2c146e294372ebb27602adbc3b4c008e9ea7038c6bd48c1ec9759da childprocess (4.1.0) sha256=3616ce99ccb242361ce7f2b19bf9ff3e6bc1d98b927c7edc29af8ca617ba6cd3 - concurrent-ruby (1.3.5) + concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6 connection_pool (2.5.3) sha256=cfd74a82b9b094d1ce30c4f1a346da23ee19dc8a062a16a85f58eab1ced4305b crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d date (3.4.1) sha256=bf268e14ef7158009bfeaec40b5fa3c7271906e88b196d958a89d4b408abe64f diff --git a/benchmarks/fluentd/Gemfile b/benchmarks/fluentd/Gemfile index 5d66eef7..461fd809 100644 --- a/benchmarks/fluentd/Gemfile +++ b/benchmarks/fluentd/Gemfile @@ -4,5 +4,4 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gem 'csv' gem 'fluentd' gem 'base64' -gem 'concurrent-ruby', github: 'ruby-concurrency/concurrent-ruby' gem 'yajl-ruby', github: 'brianmario/yajl-ruby' diff --git a/benchmarks/fluentd/Gemfile.lock b/benchmarks/fluentd/Gemfile.lock index a3f99f65..f906a661 100644 --- a/benchmarks/fluentd/Gemfile.lock +++ b/benchmarks/fluentd/Gemfile.lock @@ -4,12 +4,6 @@ GIT specs: yajl-ruby (1.4.3) -GIT - remote: https://github.com/ruby-concurrency/concurrent-ruby.git - revision: 129cf004294af68ac53e53a2f1197621b303570a - specs: - concurrent-ruby (1.3.6) - GEM remote: https://rubygems.org/ specs: @@ -33,6 +27,7 @@ GEM async-pool (0.11.1) async (>= 2.0) base64 (0.3.0) + concurrent-ruby (1.3.6) console (1.34.2) fiber-annotation fiber-local (~> 1.1) @@ -100,7 +95,6 @@ PLATFORMS DEPENDENCIES base64 - concurrent-ruby! csv fluentd yajl-ruby! @@ -110,7 +104,7 @@ CHECKSUMS async-http (0.92.1) sha256=66db56854cd9173b2f4e3b55f6ba48e15021e316425f0275e310a1d9ab173d59 async-pool (0.11.1) sha256=98e1583e199a75f7dc70f8e65fc8d0d3b28636c3f256595d43e206642ad8fbda base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b - concurrent-ruby (1.3.6) + concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab console (1.34.2) sha256=1c036abf606ccec83f9dc28f0c31710fe5936ffe7ba5d235ae2865590a482d58 cool.io (1.9.1) sha256=2001bfec1b87ad5e87c0eb9f197a6ee6f1a0433ddba04002227da6ee8b74c6c1 csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f diff --git a/benchmarks/lobsters/Gemfile b/benchmarks/lobsters/Gemfile index 325ba055..bc1e14fa 100644 --- a/benchmarks/lobsters/Gemfile +++ b/benchmarks/lobsters/Gemfile @@ -22,7 +22,6 @@ gem 'scenic' #gem 'scenic-mysql_adapter' gem "activerecord-typedstore" gem 'sprockets-rails', '2.3.3' -gem 'concurrent-ruby', github: 'ruby-concurrency/concurrent-ruby' # js gem "jquery-rails", "~> 4.3" diff --git a/benchmarks/lobsters/Gemfile.lock b/benchmarks/lobsters/Gemfile.lock index 98082d07..05c02228 100644 --- a/benchmarks/lobsters/Gemfile.lock +++ b/benchmarks/lobsters/Gemfile.lock @@ -4,12 +4,6 @@ GIT specs: stackprof (0.2.27) -GIT - remote: https://github.com/ruby-concurrency/concurrent-ruby.git - revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb - specs: - concurrent-ruby (1.3.5) - GIT remote: https://github.com/ianks/commonmarker.git revision: 6ea4f5a2be0423206dbaeca7108035a70a149ab7 @@ -127,6 +121,7 @@ GEM xpath (~> 3.2) cgi (0.5.0) chunky_png (1.4.0) + concurrent-ruby (1.3.6) connection_pool (3.0.2) crack (1.0.0) bigdecimal @@ -325,6 +320,7 @@ GEM sprockets (>= 2.8, < 4.0) sqlite3 (2.7.3) mini_portile2 (~> 2.8.0) + stackprof (0.2.27) stringio (3.1.7) svg-graph (2.2.2) thor (1.4.0) @@ -370,7 +366,6 @@ DEPENDENCIES capybara cgi commonmarker! - concurrent-ruby! database_cleaner factory_bot_rails faker @@ -401,7 +396,7 @@ DEPENDENCIES sitemap_generator sprockets-rails (= 2.3.3) sqlite3 - stackprof! + stackprof svg-graph vcr webmock @@ -432,7 +427,7 @@ CHECKSUMS cgi (0.5.0) sha256=fe99f65bb2c146e294372ebb27602adbc3b4c008e9ea7038c6bd48c1ec9759da chunky_png (1.4.0) sha256=89d5b31b55c0cf4da3cf89a2b4ebc3178d8abe8cbaf116a1dba95668502fdcfe commonmarker (2.6.1) - concurrent-ruby (1.3.5) + concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a crack (1.0.0) sha256=c83aefdb428cdc7b66c7f287e488c796f055c0839e6e545fec2c7047743c4a49 crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d @@ -527,7 +522,7 @@ CHECKSUMS sprockets (3.7.5) sha256=72c20f256548f8a37fe7db41d96be86c3262fddaf4ebe9d69ec8317394fed383 sprockets-rails (2.3.3) sha256=968794c910cc395ae10a68e3d4f5801f946b7698103e42ed49f7cad67d3654ef sqlite3 (2.7.3) sha256=d2b2fecd9341132f2cea3fde9061ee0fab9c9d532a8ecccfab4fe63d9621bf57 - stackprof (0.2.27) + stackprof (0.2.27) sha256=aff6d28656c852e74cf632cc2046f849033dc1dedffe7cb8c030d61b5745e80c stringio (3.1.7) sha256=5b78b7cb242a315fb4fca61a8255d62ec438f58da2b90be66048546ade4507fa svg-graph (2.2.2) sha256=f928866403055e6539afdfdab5f6268d108b2abc9f002e0fc51b16511809513a thor (1.4.0) sha256=8763e822ccb0f1d7bee88cde131b19a65606657b847cc7b7b4b82e772bcd8a3d diff --git a/benchmarks/railsbench/Gemfile b/benchmarks/railsbench/Gemfile index 46569794..361df27b 100644 --- a/benchmarks/railsbench/Gemfile +++ b/benchmarks/railsbench/Gemfile @@ -28,7 +28,6 @@ gem 'webrick', '~> 1.8.2' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # Needed in the benchmark for json responses gem 'jbuilder', '~> 2.7' -gem 'concurrent-ruby', github: 'ruby-concurrency/concurrent-ruby' # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker # gem 'webpacker', '~> 4.0' diff --git a/benchmarks/railsbench/Gemfile.lock b/benchmarks/railsbench/Gemfile.lock index 5c303cec..a65d9401 100644 --- a/benchmarks/railsbench/Gemfile.lock +++ b/benchmarks/railsbench/Gemfile.lock @@ -4,12 +4,6 @@ GIT specs: stackprof (0.2.27) -GIT - remote: https://github.com/ruby-concurrency/concurrent-ruby.git - revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb - specs: - concurrent-ruby (1.3.5) - GEM remote: https://rubygems.org/ specs: @@ -85,6 +79,7 @@ GEM bigdecimal (3.3.1) builder (3.3.0) cgi (0.5.0) + concurrent-ruby (1.3.6) connection_pool (3.0.2) crass (1.0.6) digest (3.2.0) @@ -178,6 +173,7 @@ GEM sqlite3 (2.7.3) mini_portile2 (~> 2.8.0) sqlite3 (2.7.3-x86_64-linux-gnu) + stackprof (0.2.27) strscan (3.1.5) thor (1.4.0) timeout (0.4.3) @@ -208,7 +204,6 @@ DEPENDENCIES base64 bigdecimal cgi - concurrent-ruby! jbuilder (~> 2.7) mutex_m net-imap (~> 0.2.1) @@ -217,7 +212,7 @@ DEPENDENCIES railties (~> 8.0) sprockets-rails (= 3.2.2) sqlite3 - stackprof! + stackprof tzinfo-data webrick (~> 1.8.2) @@ -237,7 +232,7 @@ CHECKSUMS bigdecimal (3.3.1) sha256=eaa01e228be54c4f9f53bf3cc34fe3d5e845c31963e7fcc5bedb05a4e7d52218 builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f cgi (0.5.0) sha256=fe99f65bb2c146e294372ebb27602adbc3b4c008e9ea7038c6bd48c1ec9759da - concurrent-ruby (1.3.5) + concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d digest (3.2.0) sha256=fa2e7092ec683f65d82fadde5ff4ca3b32e23ee0b19f1fc1a5e09993ad2d3991 @@ -281,7 +276,7 @@ CHECKSUMS sprockets-rails (3.2.2) sha256=62862bce136e31d7497eededde5f7730d4096bc8ef33ef7037c41423ccf89557 sqlite3 (2.7.3) sha256=d2b2fecd9341132f2cea3fde9061ee0fab9c9d532a8ecccfab4fe63d9621bf57 sqlite3 (2.7.3-x86_64-linux-gnu) sha256=11b2612fddf56602d238be7a984fa0633e591edd034f7520747bc0927b7fa865 - stackprof (0.2.27) + stackprof (0.2.27) sha256=aff6d28656c852e74cf632cc2046f849033dc1dedffe7cb8c030d61b5745e80c strscan (3.1.5) sha256=f8413b90ea9395a69609a4414a8c88551bcda64337e234272c24fcd4c83e5947 thor (1.4.0) sha256=8763e822ccb0f1d7bee88cde131b19a65606657b847cc7b7b4b82e772bcd8a3d timeout (0.4.3) sha256=9509f079b2b55fe4236d79633bd75e34c1c1e7e3fb4b56cb5fda61f80a0fe30e diff --git a/benchmarks/rubocop/Gemfile b/benchmarks/rubocop/Gemfile index b1d992a2..1c2f187c 100644 --- a/benchmarks/rubocop/Gemfile +++ b/benchmarks/rubocop/Gemfile @@ -6,4 +6,3 @@ gem "parser", ">= 3.2.2.3" # Avoid a fun ruby-lsp/rubocop bug gem "rubocop" gem "rubocop-performance" gem "rubocop-rails" -gem "concurrent-ruby", github: "ruby-concurrency/concurrent-ruby" diff --git a/benchmarks/rubocop/Gemfile.lock b/benchmarks/rubocop/Gemfile.lock index 6f90af76..c948bff7 100644 --- a/benchmarks/rubocop/Gemfile.lock +++ b/benchmarks/rubocop/Gemfile.lock @@ -1,9 +1,3 @@ -GIT - remote: https://github.com/ruby-concurrency/concurrent-ruby.git - revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb - specs: - concurrent-ruby (1.3.5) - GEM remote: https://rubygems.org/ specs: @@ -24,6 +18,7 @@ GEM base64 (0.3.0) benchmark (0.4.1) bigdecimal (3.2.2) + concurrent-ruby (1.3.5) connection_pool (2.5.3) drb (2.2.3) i18n (1.14.7) @@ -80,7 +75,6 @@ PLATFORMS x86_64-linux DEPENDENCIES - concurrent-ruby! parser (>= 3.2.2.3) rubocop rubocop-performance @@ -92,7 +86,7 @@ CHECKSUMS base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b benchmark (0.4.1) sha256=d4ef40037bba27f03b28013e219b950b82bace296549ec15a78016552f8d2cce bigdecimal (3.2.2) sha256=39085f76b495eb39a79ce07af716f3a6829bc35eb44f2195e2753749f2fa5adc - concurrent-ruby (1.3.5) + concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6 connection_pool (2.5.3) sha256=cfd74a82b9b094d1ce30c4f1a346da23ee19dc8a062a16a85f58eab1ced4305b drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373 i18n (1.14.7) sha256=ceba573f8138ff2c0915427f1fc5bdf4aa3ab8ae88c8ce255eb3ecf0a11a5d0f diff --git a/benchmarks/shipit/Gemfile b/benchmarks/shipit/Gemfile index bcb0d4a1..b3c62ecc 100644 --- a/benchmarks/shipit/Gemfile +++ b/benchmarks/shipit/Gemfile @@ -6,7 +6,6 @@ gem "rails", "~> 8.0.2" gem "sqlite3", ">= 2.1" # Use the Puma web server [https://github.com/puma/puma] gem "puma", ">= 5.0" -gem "concurrent-ruby", github: "ruby-concurrency/concurrent-ruby" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: %i[ windows jruby ] diff --git a/benchmarks/shipit/Gemfile.lock b/benchmarks/shipit/Gemfile.lock index 48099211..80ab9e9d 100644 --- a/benchmarks/shipit/Gemfile.lock +++ b/benchmarks/shipit/Gemfile.lock @@ -1,9 +1,3 @@ -GIT - remote: https://github.com/ruby-concurrency/concurrent-ruby.git - revision: 978eed6c317c523a5ce31769bdf46c0f947e6fdb - specs: - concurrent-ruby (1.3.5) - GEM remote: https://rubygems.org/ specs: @@ -103,6 +97,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) + concurrent-ruby (1.3.5) connection_pool (3.0.2) crass (1.0.6) date (3.5.1) @@ -388,7 +383,6 @@ PLATFORMS x86_64-linux DEPENDENCIES - concurrent-ruby! puma (>= 5.0) rails (~> 8.0.2) shipit-engine (>= 0.40.0) @@ -420,7 +414,7 @@ CHECKSUMS coffee-rails (5.0.0) sha256=5daaa1ba51fd4907c98a333b6a9e7c1a99b1fff57fcef999b6c62d813cb91a9c coffee-script (2.4.1) sha256=82fe281e11b93c8117b98c5ea8063e71741870f1c4fbb27177d7d6333dd38765 coffee-script-source (1.12.2) sha256=e12b16fd8927fbbf8b87cb2e9a85a6cf457c6881cc7ff8b1af15b31f70da07a4 - concurrent-ruby (1.3.5) + concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6 connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0