Skip to content

Commit 468ed72

Browse files
authored
Merge pull request #312 from sanger/develop
Release samples_extraction with ruby 3.1.4
2 parents 8ab9f6d + 621ae54 commit 468ed72

File tree

138 files changed

+3049
-4372
lines changed

Some content is hidden

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

138 files changed

+3049
-4372
lines changed

Diff for: .babelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"presets": ["@babel/preset-env", "@babel/preset-react"],
3-
"plugins": ["@babel/plugin-syntax-dynamic-import", "@babel/plugin-proposal-object-rest-spread"]
3+
"plugins": ["@babel/plugin-syntax-dynamic-import"]
44
}

Diff for: .release-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.4
1+
2.2.5

Diff for: .rubocop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ AllCops:
2222
Metrics/BlockLength:
2323
Exclude:
2424
- Gemfile
25-
IgnoredMethods:
25+
AllowedMethods:
2626
- describe
2727
- context
2828
- background

Diff for: .ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.6
1+
3.1.4

Diff for: Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
FROM ruby:2.7
2-
ENV BUNDLER_VERSION=2.2.26
1+
FROM ruby:3.1.4
32
RUN apt-get update -qq && apt-get install -y
43
# Install node and Yarn
54
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
65
RUN apt-get install -y nodejs
7-
RUN apt-get install -y python2
6+
RUN apt-get install -y python3
87
RUN npm install -g yarn
98
WORKDIR /samples_extraction
109
ADD Gemfile /samples_extraction

Diff for: Gemfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ gem 'jsonapi-resources'
4949

5050
# Tools
5151
gem 'pmb-client', git: 'https://github.com/sanger/pmb-client.git'
52-
gem 'sanger_barcode_format', git: 'https://github.com/sanger/sanger_barcode_format.git'
52+
gem 'sanger_barcode_format', git: 'https://github.com/sanger/sanger_barcode_format.git', branch: 'development'
5353

5454
# Sequencescspae
5555
gem 'faraday'
@@ -63,15 +63,15 @@ gem 'rb-readline'
6363
gem 'yard'
6464

6565
# Feature flags
66-
gem 'flipper'
67-
gem 'flipper-redis'
68-
gem 'flipper-ui'
66+
gem 'flipper', '~> 0.26.0'
67+
gem 'flipper-active_record', '~> 0.26.0'
68+
gem 'flipper-redis', '~> 0.26.0'
69+
gem 'flipper-ui', '~> 0.26.0'
6970

7071
group :development, :test do
7172
# Call 'pry' anywhere in the code to stop execution and get a debugger console
7273
gem 'pry-byebug'
7374
gem 'pry-rails'
74-
gem 'ruby-growl'
7575
end
7676

7777
group :test do

0 commit comments

Comments
 (0)