From 531b2e663eb25c2abdacbc15ac75c83de54d577e Mon Sep 17 00:00:00 2001 From: DasSkelett Date: Sun, 21 Mar 2021 16:10:11 +0100 Subject: [PATCH 1/2] Switch from outdated SharpZipLib.Patched to newer SharpZipLib --- Core/CKAN-core.csproj | 2 +- Netkan/CKAN-netkan.csproj | 2 +- Tests/Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/CKAN-core.csproj b/Core/CKAN-core.csproj index acfc97561f..c276c2df61 100644 --- a/Core/CKAN-core.csproj +++ b/Core/CKAN-core.csproj @@ -38,7 +38,7 @@ - + diff --git a/Netkan/CKAN-netkan.csproj b/Netkan/CKAN-netkan.csproj index 4b5880d5d5..523ce9e5f7 100644 --- a/Netkan/CKAN-netkan.csproj +++ b/Netkan/CKAN-netkan.csproj @@ -41,7 +41,7 @@ - + diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 5ed8314362..fe5bc454ce 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -42,7 +42,7 @@ - + From 53a137201548519e1e5b3d0967b3381c7d3c8f2d Mon Sep 17 00:00:00 2001 From: DasSkelett Date: Sun, 21 Mar 2021 16:10:45 +0100 Subject: [PATCH 2/2] Add existatus requirement for ckan-merge-pr.py --- .gitignore | 1 + bin/requirements.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 5f476424ef..d66419ff80 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ StyleCop.Cache *.ncrunchsolution *.pyc node_modules/ +venv/ # Build results [Dd]ebug/ diff --git a/bin/requirements.txt b/bin/requirements.txt index f403d5094a..7e76a2dd4f 100644 --- a/bin/requirements.txt +++ b/bin/requirements.txt @@ -1,4 +1,5 @@ click +exitstatus gitpython jsonschema pygithub