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.

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

Updates dependencies with security patches. Removes unused code #61

Merged
merged 1 commit into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -170,4 +170,6 @@ dependencies.xlsx
[Oo]bj/
[Ll]og/

*.jar
*.jar

temp/
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fi

echo "🏗️ Generating executable"
CERT_PATH=$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')
pyinstaller --onefile --clean --noconfirm --distpath dist --add-data 'src/advisor/rules/*.json:advisor/rules' --add-data 'src/advisor/tools/graviton-ready-java/target/*:advisor/tools/graviton-ready-java/target' --add-data 'src/advisor/templates/template.html:advisor/templates' --add-data "$CERT_PATH/certifi/cacert.pem:certifi" --name "$FILE_NAME" "src/porting-advisor.py" --runtime-hook 'src/updater.py' --exclude-module readline
pyinstaller --onefile --clean --noconfirm --distpath dist --add-data 'src/advisor/rules/*.json:advisor/rules' --add-data 'src/advisor/tools/graviton-ready-java/target/*:advisor/tools/graviton-ready-java/target' --add-data 'src/advisor/templates/template.html:advisor/templates' --add-data "$CERT_PATH/certifi/cacert.pem:certifi" --name "$FILE_NAME" "src/porting-advisor.py" --exclude-module readline
if [ $? -ne 0 ]; then
echo "**ERROR**: pyinstaller failed, binary was not created" && exit 1
fi
Expand Down
2 changes: 1 addition & 1 deletion porting-advisor-win-x64.spec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ a = Analysis(
hiddenimports=[],
hookspath=[],
hooksconfig={},
runtime_hooks=['src\\updater.py'],
runtime_hooks=[],
excludes=['readline', 'pyinstaller', 'pyinstaller-hooks-contrib'],
win_no_prefer_redirects=False,
win_private_assemblies=False,
Expand Down
8 changes: 3 additions & 5 deletions requirements-build.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
altgraph==0.17.3
certifi==2023.7.22
charset-normalizer==3.2.0
coverage==7.2.7
idna==3.4
Jinja2==3.1.2
idna==3.7
Jinja2==3.1.4
MarkupSafe==2.1.3
packaging==23.1
progressbar33==2.4
pyinstaller==5.13.1
pyinstaller-hooks-contrib==2023.6
pyparsing==3.1.1
requests==2.31.0
urllib3==2.0.7
urllib3==2.2.2
XlsxWriter==3.1.2
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
altgraph==0.17.3
Jinja2==3.1.2
Jinja2==3.1.4
MarkupSafe==2.1.3
packaging==23.1
progressbar33==2.4
Expand Down
67 changes: 0 additions & 67 deletions src/updater.py

This file was deleted.

1 change: 0 additions & 1 deletion unittest/test_manifester.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ def test_get_dependencies_for_pip_returns_array_of_dependencies(self):
self.assertEqual('requirements.txt', dependencies[1].filename)
self.assertEqual('pip', dependencies[1].tool)
self.assertEqual(3, dependencies[1].lineno)
self.assertEqual('3.1.2', dependencies[1].installed_version)

def test_get_dependencies_for_maven_returns_array_of_dependencies(self):
manifester = Manifester()
Expand Down
Loading