Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into ach
Browse files Browse the repository at this point in the history
* origin/master:
  Add wallpapers for feh
  Add a program to display programs eating up most RAM
  Bump yapf from 0.30.0 to 0.31.0 (#1440)
  Bump cfn-lint from 0.47.1 to 0.47.2 (#1437)
  Bump setuptools from 54.1.1 to 54.1.2 (#1439)
  Bump flake8 from 3.8.4 to 3.9.0 (#1438)
  Bump dotbot from `eb7f3fb` to `4722233` (#1436)
  Bump cfn-lint from 0.47.0 to 0.47.1 (#1434)
  Bump npm from 7.6.2 to 7.6.3 (#1435)
  Bump npm from 7.6.1 to 7.6.2 (#1433)
  Bump cfn-lint from 0.46.0 to 0.47.0 (#1432)
  Bump dependencies/pyenv from `abcbf6e` to `80e418e` (#1431)
  Bump vim-language-server from 2.1.2 to 2.1.3 (#1430)
  Bump flake8-bugbear from 21.3.1 to 21.3.2 (#1429)
  • Loading branch information
Tomasz Trębski committed Mar 15, 2021
2 parents dbf9a7d + 986c7dc commit 547dcfd
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 9 deletions.
11 changes: 11 additions & 0 deletions bin/top_mem
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash
# Display the top applications of memory usage
# http://www.cyberciti.biz/faq/linux-check-memory-usage/#comment-51021

while read -r command percent rss; do
if [[ "${command}" != "COMMAND" ]]; then
rss="$(bc <<<"scale=2;${rss}/1024")"
fi
printf " %-26s%-8s%s\n" "${command}" "${percent}" "${rss} MB" |
sed 's/COMMAND/PROGRAM/' | sed 's/RSS MB/#MEM/'
done < <(ps -A --sort -rss -o comm,pmem,rss | head -n 20)
2 changes: 1 addition & 1 deletion dotbot
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"npm": "7.6.1",
"npm": "7.6.3",
"neovim": "4.9.0",
"prettier": "2.2.1",
"typescript": "4.2.3",
"@elm-tooling/elm-language-server": "2.0.3",
"bash-language-server": "1.17.0",
"vim-language-server": "2.1.2",
"vim-language-server": "2.1.3",
"dockerfile-language-server-nodejs": "0.3.0",
"yaml-language-server": "0.16.0"
}
Expand Down
10 changes: 5 additions & 5 deletions python-system-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
pip==21.0

setuptools==54.1.1 ; python_version >= '3.0'
setuptools==54.1.2 ; python_version >= '3.0'
setuptools==44.0.0 ; python_version < '3.0'
wheel==0.36.2

mypy==0.812; python_version >= '3.0' --no-binary mypy

flake8==3.8.4;
flake8-bugbear==21.3.1; python_version >= '3.0'
flake8==3.9.0;
flake8-bugbear==21.3.2; python_version >= '3.0'
flake8-commas==2.0.0
flake8-quotes==3.2.0
flake8-print==4.0.0; python_version >= '3.0'
Expand All @@ -17,8 +17,8 @@ flake8-bandit==2.1.2
flake8-comprehensions==3.3.1; python_version >= '3.0'
flake8-comprehensions==1.4.1; python_version < '3.0'

yapf==0.30.0
yapf==0.31.0

cfn-lint==0.46.0
cfn-lint==0.47.2

wakatime==13.1.0

0 comments on commit 547dcfd

Please sign in to comment.