Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies #293

Merged
merged 7 commits into from
Feb 18, 2022
Merged

Upgrade dependencies #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f0960b0
Update react-scripts and move to prettier
matteofigus Feb 17, 2022
06d46c8
Merge branch 'master' of github.com:awslabs/amazon-s3-find-and-forget…
matteofigus Feb 17, 2022
53171e6
Move to node 14
matteofigus Feb 17, 2022
92f0936
Prose wrap
matteofigus Feb 17, 2022
cb3981d
Update arrow + numpy
matteofigus Feb 18, 2022
130fc73
Changelog + version bump
matteofigus Feb 18, 2022
cdf1aa5
Refresh creds on each module
matteofigus Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Set up Nodejs 12
uses: actions/setup-node@v1
with:
node-version: 12
node-version: 14
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Create React App v5 includes loads of warnings for node 12 so I moved all to node 14.

- name: Set up ruby 2.6
uses: actions/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Set up Nodejs 12
uses: actions/setup-node@v1
with:
node-version: 12
node-version: 14
- name: Set up ruby 2.6
uses: actions/setup-ruby@v1
with:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## v0.44

- [#293](https://github.com/awslabs/amazon-s3-find-and-forget/pull/293): Upgrade
dependencies

## v0.43

- [#289](https://github.com/awslabs/amazon-s3-find-and-forget/pull/289): Upgrade
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ format-cfn:

.PHONY: format-docs
format-docs:
npx prettier-eslint ./*.md ./docs/*.md --write --prose-wrap always
npx prettier ./*.md ./docs/*.md --write
Copy link
Member Author

@matteofigus matteofigus Feb 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Create React App v5 moved internally to ESLint 8, and prettier-eslint cli is stuck to ESLint 5: prettier/prettier-eslint-cli#304

When upgrading, prettier-eslint was failing. I decided to just move to prettier cli, which has a --write functionality as well. The difference is that instead of inferring the linting config from the Create React App module, I am defining the config inside the root's package.json. But the advantage is that the dependency tree is much smaller and that allows to remove some vulnerabilities too.

When running with just prettier, the linting is 99% same. You'll notice a couple of new line changes in 5 JavaScript files, but I decided that it was ok for now.

git add *.md
git add docs/*.md

.PHONY: format-js
format-js:
npx prettier-eslint $(PWD)/frontend/src/**/*.js --write --prose-wrap always
npx prettier $(PWD)/frontend/src/**/*.js --write
git add frontend/src/

.PHONY: format-python
Expand Down
4 changes: 2 additions & 2 deletions backend/ecs_tasks/delete_files/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pyarrow==2.0.0
pyarrow==7.0.0
s3fs==0.4.0
python-snappy==0.5.4
pandas==1.1.1
boto3==1.17.85
numpy==1.19.1
numpy==1.21.5
cryptography==3.4.7
urllib3>=1.26.5
aws-assume-role-lib>=2.9.0
4 changes: 2 additions & 2 deletions backend/ecs_tasks/delete_files/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ jmespath==0.10.0
# via
# boto3
# botocore
numpy==1.19.1
numpy==1.21.5
# via
# -r backend/ecs_tasks/delete_files/requirements.in
# pandas
# pyarrow
pandas==1.1.1
# via -r backend/ecs_tasks/delete_files/requirements.in
pyarrow==2.0.0
pyarrow==7.0.0
# via -r backend/ecs_tasks/delete_files/requirements.in
pycparser==2.20
# via cffi
Expand Down
2 changes: 1 addition & 1 deletion docs/LOCAL_DEVELOPMENT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The following dependencies must be installed:

- AWS CLI
- Python >=3.7 and pip
- node.js >= v12
- node.js >= v14
- virtualenv
- Ruby >= 2.6

Expand Down
Loading