diff --git a/.github/workflows/prepare-release-v1.yml b/.github/workflows/prepare-release-v1.yml index fabf3edd8f..7c38faedf3 100644 --- a/.github/workflows/prepare-release-v1.yml +++ b/.github/workflows/prepare-release-v1.yml @@ -16,10 +16,10 @@ jobs: with: app_id: ${{ secrets.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - name: Set up Python 2.7 - uses: actions/setup-python@v2 + - name: Set up Python 3.10 + uses: actions/setup-python@v4 with: - python-version: 2.7 + python-version: '3.10' - name: Set up Java 8 uses: actions/setup-java@v1 with: diff --git a/.github/workflows/release-v1.yml b/.github/workflows/release-v1.yml index 7d155d0ccb..e9fd7fdd7c 100644 --- a/.github/workflows/release-v1.yml +++ b/.github/workflows/release-v1.yml @@ -16,10 +16,10 @@ jobs: with: app_id: ${{ secrets.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - name: Set up Python 2.7 - uses: actions/setup-python@v2 + - name: Set up Python 3.10 + uses: actions/setup-python@v4 with: - python-version: 2.7 + python-version: '3.10' - name: Set up Java 8 uses: actions/setup-java@v1 with: diff --git a/CI/ghApiClient.py b/CI/ghApiClient.py index 76bb1deb9b..fcec1eace8 100755 --- a/CI/ghApiClient.py +++ b/CI/ghApiClient.py @@ -2,8 +2,8 @@ import os import time -import urllib2 -import httplib +import urllib.request, urllib.error, urllib.parse +import http.client import json GH_BASE_URL = "https://api.github.com/" @@ -13,46 +13,47 @@ def readUrl(name): try: - request = urllib2.Request(GH_BASE_URL + name) + request = urllib.request.Request(GH_BASE_URL + name) request.add_header("Authorization", GH_AUTH) - content = urllib2.urlopen(request).read() + content = urllib.request.urlopen(request).read() jcont = json.loads(content) - return jcont; - except urllib2.HTTPError, e: - print 'HTTPError = ' + str(e.code) + return jcont + except urllib.error.HTTPError as e: + print(('HTTPError = ' + str(e.code))) raise e - except urllib2.URLError, e: - print 'URLError = ' + str(e.reason) + except urllib.error.URLError as e: + print(('URLError = ' + str(e.reason))) raise e - except httplib.HTTPException, e: - print 'HTTPException = ' + str(e) + except http.client.HTTPException as e: + print(('HTTPException = ' + str(e))) raise e except Exception: import traceback - print 'generic exception: ' + traceback.format_exc() + print(('generic exception: ' + traceback.format_exc())) raise IOError def postUrl(name, body): global GH_BASE_URL try: time.sleep(0.05) - request = urllib2.Request(GH_BASE_URL + name) + request = urllib.request.Request(GH_BASE_URL + name) request.add_header("Authorization", GH_AUTH) request.add_header("Accept", "application/vnd.github.v3+json") - content = urllib2.urlopen(request, body).read() + data = body.encode('utf-8') + content = urllib.request.urlopen(request, data).read() jcont = json.loads(content) - return jcont; - except urllib2.HTTPError, e: - print 'HTTPError = ' + str(e.code) - print str(e) + return jcont + except urllib.error.HTTPError as e: + print(('HTTPError = ' + str(e.code))) + print((str(e))) raise e - except urllib2.URLError, e: - print 'URLError = ' + str(e.reason) + except urllib.error.URLError as e: + print(('URLError = ' + str(e.reason))) raise e - except httplib.HTTPException, e: - print 'HTTPException = ' + str(e) + except http.client.HTTPException as e: + print(('HTTPException = ' + str(e))) raise e except Exception: import traceback - print 'generic exception: ' + traceback.format_exc() + print(('generic exception: ' + traceback.format_exc())) raise IOError diff --git a/CI/lastReleaseV1.py b/CI/lastReleaseV1.py index 6a0736c953..bb02b84e8d 100755 --- a/CI/lastReleaseV1.py +++ b/CI/lastReleaseV1.py @@ -13,7 +13,8 @@ def getLastReleaseTag(): # main def main(): result = getLastReleaseTag() - print result + print(result) # here start main main() + diff --git a/CI/publishReleaseV1.py b/CI/publishReleaseV1.py index d04abcbf3b..9b026217db 100755 --- a/CI/publishReleaseV1.py +++ b/CI/publishReleaseV1.py @@ -25,3 +25,4 @@ def main(tag): # here start main main(sys.argv[1]) + diff --git a/CI/releaseNotesV1.py b/CI/releaseNotesV1.py index e30b1392af..eb501a8558 100755 --- a/CI/releaseNotesV1.py +++ b/CI/releaseNotesV1.py @@ -12,13 +12,13 @@ def allPulls(releaseDate): baseurl = "https://api.github.com/repos/swagger-api/swagger-parser/pulls/" content = ghApiClient.readUrl('repos/swagger-api/swagger-parser/pulls?state=closed&base=v1&per_page=100') for l in content: - stripped = l["url"][len(baseurl):] - mergedAt = l["merged_at"] - if mergedAt is not None: - if datetime.strptime(mergedAt, '%Y-%m-%dT%H:%M:%SZ') > releaseDate: - if not l['title'].startswith("bump snap"): - result += '\n' - result += "* " + l['title'] + " (#" + stripped + ")" + stripped = l["url"][len(baseurl):] + mergedAt = l["merged_at"] + if mergedAt is not None: + if datetime.strptime(mergedAt, '%Y-%m-%dT%H:%M:%SZ') > releaseDate: + if not l['title'].startswith("bump snap"): + result += '\n' + result += "* " + l['title'] + " (#" + stripped + ")" return result @@ -49,3 +49,4 @@ def main(last_release, release_title, tag): # here start main main(sys.argv[1], sys.argv[2], sys.argv[3]) + diff --git a/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java b/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java index 8005e3d50e..17b7767095 100644 --- a/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java +++ b/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java @@ -10,6 +10,7 @@ import java.io.File; import java.io.IOException; import java.math.BigDecimal; +import java.nio.file.Files; import java.util.*; import io.swagger.models.*; @@ -18,7 +19,6 @@ import org.apache.commons.io.FileUtils; import org.testng.Assert; import org.testng.annotations.Test; -import org.testng.reporters.Files; import com.fasterxml.jackson.databind.JsonNode; @@ -1586,7 +1586,7 @@ public void readingSpecStringShouldNotOverQuotingStringExample() throws Exceptio @Test(description = "A string example should not be over quoted when parsing a yaml node") public void readingSpecNodeShouldNotOverQuotingStringExample() throws Exception { - String yaml = Files.readFile(new File("src/test/resources/over-quoted-example.yaml")); + String yaml = new String(Files.readAllBytes(new File("src/test/resources/over-quoted-example.yaml").toPath()), "UTF-8"); JsonNode rootNode = Yaml.mapper().readValue(yaml, JsonNode.class); SwaggerParser parser = new SwaggerParser(); Swagger swagger = parser.read(rootNode, true); diff --git a/pom.xml b/pom.xml index 8a2fd654ca..39c3923ede 100644 --- a/pom.xml +++ b/pom.xml @@ -393,9 +393,9 @@ 2.11.0 - 2.0 - 1.7.36 - 1.6.11 + 2.2 + 2.0.9 + 1.6.12 4.13.2 6.9.6 1.19