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

Hot fixes on 2023.5 #402

Merged
merged 11 commits into from
Jul 15, 2023
4 changes: 2 additions & 2 deletions bin/deploy-hobby
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

export KARRIO_TAG="${KARRIO_TAG:-2023.5}"
export KARRIO_TAG="${KARRIO_TAG:-2023.5.1}"
export SENTRY_DSN="${SENTRY_DSN:-'https://[email protected]/1'}"

SECRET_KEY=$(head -c 28 /dev/urandom | sha224sum -b | head -c 56)
Expand All @@ -23,7 +23,7 @@ if ! [ -z "$1" ]
then
export KARRIO_TAG=$1
else
echo "What version of Karrio would you like to install? (We default to '2023.5')"
echo "What version of Karrio would you like to install? (We default to '2023.5.1')"
echo "You can check out available versions here: https://hub.docker.com/r/karrio/server/tags"
read -r KARRIO_TAG_READ
if [ -z "$KARRIO_TAG_READ" ]
Expand Down
2 changes: 1 addition & 1 deletion bin/upgrade-hobby
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ else
fi

[[ -f ".env" ]] && export $(cat .env | xargs) || ( echo "No .env file found. Please create it with SECRET_KEY and DOMAIN set." && exit 1)
export KARRIO_TAG="${KARRIO_TAG:-2023.5}"
export KARRIO_TAG="${KARRIO_TAG:-2023.5.1}"

# get karrio scripts
mkdir -p ./karrio
Expand Down
6 changes: 3 additions & 3 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3"
services:
api:
container_name: karrio.api
image: karrio.docker.scarf.sh/karrio/server:2023.5
image: karrio.docker.scarf.sh/karrio/server:2023.5.1
restart: unless-stopped
ports:
- ${KARRIO_HTTP_PORT}:${KARRIO_HTTP_PORT}
Expand All @@ -25,7 +25,7 @@ services:

worker:
container_name: karrio.worker
image: karrio.docker.scarf.sh/karrio/server:2023.5
image: karrio.docker.scarf.sh/karrio/server:2023.5.1
restart: unless-stopped
depends_on:
- db
Expand All @@ -46,7 +46,7 @@ services:

dashboard:
container_name: karrio.dashboard
image: karrio.docker.scarf.sh/karrio/dashboard:2023.5
image: karrio.docker.scarf.sh/karrio/dashboard:2023.5.1
ports:
- ${DASHBOARD_PORT}:3000/tcp
depends_on:
Expand Down
60 changes: 31 additions & 29 deletions requirements.light.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ carrier.yanwen==2021.2.1
carrier.yunexpress==2021.2.1
certifi==2023.5.7
cffi==1.15.1
charset-normalizer==3.1.0
click==8.1.3
charset-normalizer==3.2.0
click==8.1.5
cryptography==41.0.2
defusedxml==0.7.1
Deprecated==1.2.14
Expand All @@ -33,23 +33,23 @@ diff-match-patch==20230430
dj-database-url==2.0.0
Django==4.2.3
django-constance==2.9.1
django-cors-headers==4.0.0
django-cors-headers==4.2.0
django-downloadview==2.3.0
django-email-verification==0.3.1
django-filter==23.2
django-formtools==2.4.1
django-health-check==3.17.0
django-import-export==3.2.0
django-oauth-toolkit==2.3.0
django-otp==1.2.1
django-otp==1.2.2
django-phonenumber-field==6.4.0
django-picklefield==3.1
django-redis==5.2.0
django-two-factor-auth==1.15.2
django-redis==5.3.0
django-two-factor-auth==1.15.3
djangorestframework==3.14.0
djangorestframework-simplejwt==5.2.2
drf-api-tracking==1.8.4
drf-spectacular==0.26.2
drf-spectacular==0.26.3
et-xmlfile==1.1.0
graphql-core==3.2.3
gunicorn==20.1.0
Expand All @@ -60,23 +60,24 @@ idna==3.4
inflection==0.5.1
Jinja2==3.1.2
jsonfield==3.1.0
jsonschema==4.17.3
jsonschema==4.18.3
jsonschema-specifications==2023.6.1
jstruct==2021.11
jwcrypto==1.5.0
karrio==2023.5
karrio==2023.5.1
karrio.amazon-mws==2023.4.4
karrio.aramex==2023.4
karrio.australiapost==2023.4
karrio.boxknight==2023.4
karrio.boxknight==2023.5.1
karrio.canadapost==2023.4.7
karrio.canpar==2023.4.4
karrio.chronopost==2023.4.4
karrio.dhl-express==2023.5
karrio.dhl-express==2023.5.1
karrio.dhl-poland==2023.4.4
karrio.dhl-universal==2023.4
karrio.dicom==2023.4.4
karrio.dpd==2023.4.4
karrio.dpdhl==2023.4.4
karrio.dpd==2023.5.1
karrio.dpdhl==2023.5.1
karrio.easypost==2023.4.4
karrio.eshipper==2023.4.4
karrio.fedex==2023.5
Expand All @@ -89,7 +90,7 @@ karrio.purolator==2023.4.4
karrio.roadie==2023.4.4
karrio.royalmail==2023.4
karrio.sendle==2023.4
karrio.server==2023.5
karrio.server==2023.5.1
karrio.server.apps==2023.1
karrio.server.core==2023.5
karrio.server.data==2023.1.10
Expand All @@ -102,12 +103,12 @@ karrio.server.pricing==2023.4
karrio.server.proxy==2023.4
karrio.sf-express==2023.4
karrio.tnt==2023.4.4
karrio.ups==2023.5
karrio.usps==2023.4.4
karrio.ups==2023.5.1
karrio.usps==2023.5.1
karrio.usps-international==2023.4.4
karrio.yanwen==2023.4
karrio.yunexpress==2023.4
lxml==4.9.2
lxml==4.9.3
lxml-stubs==0.4.0
MarkupPy==1.14
MarkupSafe==2.1.3
Expand All @@ -116,34 +117,35 @@ oauthlib==3.2.2
odfpy==1.4.1
openpyxl==3.1.2
packaging==23.1
phonenumbers==8.13.13
Pillow==9.5.0
phonenumbers==8.13.16
Pillow==10.0.0
psutil==5.9.5
psycopg2-binary==2.9.6
py-soap==2020.3.2
pycparser==2.21
PyJWT==2.7.0
PyPDF2==3.0.1
pypng==0.20220715.0
pyrsistent==0.19.3
python-barcode==0.14.0
python-barcode==0.15.1
python-dateutil==2.8.2
python-decouple==3.8
pytz==2023.3
PyYAML==6.0
qrcode==7.4.2
redis==4.5.5
redis==4.6.0
referencing==0.29.1
requests==2.31.0
sentry-sdk==1.25.0
rpds-py==0.8.10
sentry-sdk==1.28.1
six==1.16.0
sqlparse==0.4.4
strawberry-graphql==0.180.5
tablib==3.4.0
typing_extensions==4.6.3
strawberry-graphql==0.195.2
tablib==3.5.0
typing_extensions==4.7.1
uritemplate==4.1.1
urllib3==2.0.2
uvicorn==0.22.0
whitenoise==6.4.0
urllib3==2.0.3
uvicorn==0.23.0
whitenoise==6.5.0
wrapt==1.15.0
xlrd==2.0.1
xlwt==1.3.0
Expand Down
66 changes: 34 additions & 32 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ carrier.yanwen==2021.2.1
carrier.yunexpress==2021.2.1
certifi==2023.5.7
cffi==1.15.1
charset-normalizer==3.1.0
click==8.1.3
charset-normalizer==3.2.0
click==8.1.5
cryptography==41.0.2
cssselect2==0.7.0
defusedxml==0.7.1
Expand All @@ -35,25 +35,25 @@ diff-match-patch==20230430
dj-database-url==2.0.0
Django==4.2.3
django-constance==2.9.1
django-cors-headers==4.0.0
django-cors-headers==4.2.0
django-downloadview==2.3.0
django-email-verification==0.3.1
django-filter==23.2
django-formtools==2.4.1
django-health-check==3.17.0
django-import-export==3.2.0
django-oauth-toolkit==2.3.0
django-otp==1.2.1
django-otp==1.2.2
django-phonenumber-field==6.4.0
django-picklefield==3.1
django-redis==5.2.0
django-two-factor-auth==1.15.2
django-redis==5.3.0
django-two-factor-auth==1.15.3
djangorestframework==3.14.0
djangorestframework-simplejwt==5.2.2
drf-api-tracking==1.8.4
drf-spectacular==0.26.2
drf-spectacular==0.26.3
et-xmlfile==1.1.0
fonttools==4.39.4
fonttools==4.41.0
graphql-core==3.2.3
gunicorn==20.1.0
h11==0.14.0
Expand All @@ -64,23 +64,24 @@ idna==3.4
inflection==0.5.1
Jinja2==3.1.2
jsonfield==3.1.0
jsonschema==4.17.3
jsonschema==4.18.3
jsonschema-specifications==2023.6.1
jstruct==2021.11
jwcrypto==1.5.0
karrio==2023.5
karrio==2023.5.1
karrio.amazon-mws==2023.4.4
karrio.aramex==2023.4
karrio.australiapost==2023.4
karrio.boxknight==2023.4
karrio.boxknight==2023.5.1
karrio.canadapost==2023.4.7
karrio.canpar==2023.4.4
karrio.chronopost==2023.4.4
karrio.dhl-express==2023.5
karrio.dhl-express==2023.5.1
karrio.dhl-poland==2023.4.4
karrio.dhl-universal==2023.4
karrio.dicom==2023.4.4
karrio.dpd==2023.4.4
karrio.dpdhl==2023.4.4
karrio.dpd==2023.5.1
karrio.dpdhl==2023.5.1
karrio.easypost==2023.4.4
karrio.eshipper==2023.4.4
karrio.fedex==2023.5
Expand All @@ -93,7 +94,7 @@ karrio.purolator==2023.4.4
karrio.roadie==2023.4.4
karrio.royalmail==2023.4
karrio.sendle==2023.4
karrio.server==2023.5
karrio.server==2023.5.1
karrio.server.apps==2023.1
karrio.server.core==2023.5
karrio.server.data==2023.1.10
Expand All @@ -107,12 +108,12 @@ karrio.server.pricing==2023.4
karrio.server.proxy==2023.4
karrio.sf-express==2023.4
karrio.tnt==2023.4.4
karrio.ups==2023.5
karrio.usps==2023.4.4
karrio.ups==2023.5.1
karrio.usps==2023.5.1
karrio.usps-international==2023.4.4
karrio.yanwen==2023.4
karrio.yunexpress==2023.4
lxml==4.9.2
lxml==4.9.3
lxml-stubs==0.4.0
MarkupPy==1.14
MarkupSafe==2.1.3
Expand All @@ -121,40 +122,41 @@ oauthlib==3.2.2
odfpy==1.4.1
openpyxl==3.1.2
packaging==23.1
phonenumbers==8.13.13
Pillow==9.5.0
phonenumbers==8.13.16
Pillow==10.0.0
psutil==5.9.5
psycopg2-binary==2.9.6
py-soap==2020.3.2
pycparser==2.21
pydyf==0.6.0
pydyf==0.7.0
PyJWT==2.7.0
PyPDF2==3.0.1
pyphen==0.14.0
pypng==0.20220715.0
pyrsistent==0.19.3
python-barcode==0.14.0
python-barcode==0.15.1
python-dateutil==2.8.2
python-decouple==3.8
pytz==2023.3
PyYAML==6.0
qrcode==7.4.2
redis==4.5.5
redis==4.6.0
referencing==0.29.1
requests==2.31.0
sentry-sdk==1.25.0
rpds-py==0.8.10
sentry-sdk==1.28.1
six==1.16.0
sqlparse==0.4.4
strawberry-graphql==0.180.5
tablib==3.4.0
strawberry-graphql==0.195.2
tablib==3.5.0
tinycss2==1.2.1
treepoem==3.18.0
typing_extensions==4.6.3
treepoem==3.20.0
typing_extensions==4.7.1
uritemplate==4.1.1
urllib3==2.0.2
uvicorn==0.22.0
urllib3==2.0.3
uvicorn==0.23.0
weasyprint==59.0
webencodings==0.5.1
whitenoise==6.4.0
whitenoise==6.5.0
wrapt==1.15.0
xlrd==2.0.1
xlwt==1.3.0
Expand Down
4 changes: 4 additions & 0 deletions sdk/core/karrio/api/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ def abort(
Returns:
Tuple[None, List[models.Message]]: a tuple of empty response and a list or error messages
"""

if isinstance(error, errors.ParsedMessagesError):
return None, error.messages

return (
None,
[
Expand Down
Loading