Patch 2023.5.2

bin/build-server-image-from-source

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Source environment variables
+source "bin/_env"
+
+echo 'building server image from source...'
+docker build -f "${ROOT}/docker/Dockerfile" -t karrio/server:$1 "${ROOT}" --build-arg REQUIREMENTS=source.requirements.txt "${@:2}"

bin/deploy-hobby

@@ -2,7 +2,7 @@
 
 set -e
 
-export KARRIO_TAG="${KARRIO_TAG:-2023.5.1}"
+export KARRIO_TAG="${KARRIO_TAG:-2023.5.2}"
 export SENTRY_DSN="${SENTRY_DSN:-'https://public@sentry.example.com/1'}"
 
 SECRET_KEY=$(head -c 28 /dev/urandom | sha224sum -b | head -c 56)
@@ -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.1')"
+echo "What version of Karrio would you like to install? (We default to '2023.5.2')"
 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" ]

bin/upgrade-hobby

@@ -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.1}"
+export KARRIO_TAG="${KARRIO_TAG:-2023.5.2}"
 
 # get karrio scripts
 mkdir -p ./karrio

docker-compose.yml

@@ -0,0 +1,19 @@
+services:
+  api:
+    build:
+      context: .
+      dockerfile: docker/dev.Dockerfile
+    container_name: karrio.api
+    command: karrio runserver 0.0.0.0:5002
+    ports:
+      - 5002:5002
+    volumes:
+      - .:/code
+
+  maildev:
+    container_name: karrio.mail
+    image: maildev/maildev
+    restart: on-failure
+    ports:
+      - "1080:1080"
+      - "1025:1025"

docker/Dockerfile

@@ -9,7 +9,9 @@ RUN apt-get update -y && apt-get install -y gcc
 RUN python -m venv /karrio/venv
 ENV PATH="/karrio/venv/bin:$PATH"
 COPY "${REQUIREMENTS}" /temp/
-RUN pip install --upgrade pip && \
+COPY . /temp/app/
+RUN cd /temp/app && \
+    pip install --upgrade pip && \
     pip install dumb-init && \
     pip install -r "/temp/${REQUIREMENTS}"
 

docker/dev.Dockerfile

@@ -0,0 +1,17 @@
+# The base image compilation
+FROM python:3.10-slim
+
+WORKDIR /code
+
+RUN apt-get update -y && apt-get install -y gcc libpango1.0-0 libpangoft2-1.0-0 ghostscript
+RUN python -m venv /karrio/venv
+ENV PATH="/karrio/venv/bin:$PATH"
+
+COPY requirements.server.dev.txt /temp/requirements.txt
+COPY . .
+RUN pip install --upgrade pip && \
+    pip install -r /temp/requirements.txt
+
+EXPOSE 5002
+
+CMD ["karrio", "runserver", "0.0.0.0:5002"]

docker/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3"
 services:
   api:
     container_name: karrio.api
-    image: karrio.docker.scarf.sh/karrio/server:2023.5.1
+    image: karrio.docker.scarf.sh/karrio/server:2023.5.2
     restart: unless-stopped
     ports:
       - ${KARRIO_HTTP_PORT}:${KARRIO_HTTP_PORT}
@@ -25,7 +25,7 @@ services:
 
   worker:
     container_name: karrio.worker
-    image: karrio.docker.scarf.sh/karrio/server:2023.5.1
+    image: karrio.docker.scarf.sh/karrio/server:2023.5.2
     restart: unless-stopped
     depends_on:
       - db
@@ -46,7 +46,7 @@ services:
 
   dashboard:
     container_name: karrio.dashboard
-    image: karrio.docker.scarf.sh/karrio/dashboard:2023.5.1
+    image: karrio.docker.scarf.sh/karrio/dashboard:2023.5.2
     ports:
       - ${DASHBOARD_PORT}:3000/tcp
     depends_on:

requirements.server.dev.txt

@@ -1,80 +1,62 @@
 django-debug-toolbar
 
-# Schemas update (change schemas to setup.py before next update)
-# -e ./schemas/dpdhl
+# Schemas update
+./schemas/aramex
+./schemas/australiapost
+./schemas/canadapost
+./schemas/canpar
+./schemas/chronopost
+# ./schemas/dhl_express
+./schemas/dhl_poland
+./schemas/dicom
+./schemas/dpd
+./schemas/dpdhl
+# ./schemas/fedex
+./schemas/purolator
+./schemas/royalmail
+./schemas/sendle
+./schemas/sf_express
+./schemas/tnt
+./schemas/usps
+./schemas/yanwen
+./schemas/yunexpress
 
 # Carrier Extentions in Development
-# -e ./sdk/core
-# -e ./sdk/extensions/generic
-# -e ./sdk/extensions/amazon_mws
-# -e ./sdk/extensions/aramex
-# -e ./sdk/extensions/australiapost
-# -e ./sdk/extensions/boxknight
-# -e ./sdk/extensions/canadapost
-# -e ./sdk/extensions/canpar
-# -e ./sdk/extensions/chronopost
-# -e ./sdk/extensions/dhl_express
-# -e ./sdk/extensions/dhl_poland
-# -e ./sdk/extensions/dhl_universal
-# -e ./sdk/extensions/dicom
-# -e ./sdk/extensions/dpd
-# -e ./sdk/extensions/dpdhl
-# -e ./sdk/extensions/fedex
-# -e ./sdk/extensions/geodis
-# -e ./sdk/extensions/laposte
-# -e ./sdk/extensions/nationex
-# -e ./sdk/extensions/purolator
-# -e ./sdk/extensions/roadie
-# -e ./sdk/extensions/royalmail
-# -e ./sdk/extensions/sendle
-# -e ./sdk/extensions/sf_express
-# -e ./sdk/extensions/tnt
-# -e ./sdk/extensions/ups
-# -e ./sdk/extensions/usps
-# -e ./sdk/extensions/usps_international
-# -e ./sdk/extensions/yanwen
-# -e ./sdk/extensions/yunexpress
+./sdk/core
+./sdk/extensions/generic
+./sdk/extensions/amazon_mws
+./sdk/extensions/aramex
+./sdk/extensions/australiapost
+./sdk/extensions/boxknight
+./sdk/extensions/canadapost
+./sdk/extensions/canpar
+./sdk/extensions/chronopost
+./sdk/extensions/dhl_express
+./sdk/extensions/dhl_poland
+./sdk/extensions/dhl_universal
+./sdk/extensions/dicom
+./sdk/extensions/dpd
+./sdk/extensions/dpdhl
+./sdk/extensions/fedex
+./sdk/extensions/geodis
+./sdk/extensions/laposte
+./sdk/extensions/nationex
+./sdk/extensions/purolator
+./sdk/extensions/roadie
+./sdk/extensions/royalmail
+./sdk/extensions/sendle
+./sdk/extensions/sf_express
+./sdk/extensions/tnt
+./sdk/extensions/ups
+./sdk/extensions/usps
+./sdk/extensions/usps_international
+./sdk/extensions/yanwen
+./sdk/extensions/yunexpress
 
 # Carrier Hub Extentions in Development
-# -e ./sdk/vendors/easypost
-# -e ./sdk/vendors/eshipper
-# -e ./sdk/vendors/freightcom
-
-
-karrio
-karrio.generic
-karrio.amazon-mws
-karrio.aramex
-karrio.australiapost
-karrio.boxknight
-karrio.canadapost
-karrio.canpar
-karrio.chronopost
-karrio.dhl-express
-karrio.dhl-poland
-karrio.dhl-universal
-karrio.dicom
-karrio.dpd
-karrio.dpdhl
-karrio.fedex
-karrio.geodis
-karrio.laposte
-karrio.nationex
-karrio.purolator
-karrio.roadie
-karrio.royalmail
-karrio.sendle
-karrio.sf-express
-karrio.tnt
-karrio.ups
-karrio.usps
-karrio.usps-international
-karrio.yanwen
-karrio.yunexpress
-
-karrio.easypost
-karrio.eshipper
-karrio.freightcom
+./sdk/vendors/easypost
+./sdk/vendors/eshipper
+./sdk/vendors/freightcom
 
 
 # karrio server core modules

schemas/aramex/setup.py

@@ -1,12 +1,26 @@
 """Warning: This setup.py is only there for git install until poetry support git subdirectory"""
-
 from setuptools import setup, find_packages
 
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
 setup(
     name="carrier.aramex",
-    version="0.0.0-dev",
+    version="2021.3",
+    description="Aramex Web API Schemas Python Data Types library",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    url="https://github.com/karrioapi/karrio",
+    author="Karrio",
+    author_email="hello@karrio.io",
     license="Apache-2.0",
     packages=find_packages(),
     install_requires=["six", "lxml"],
+    classifiers=[
+        "Intended Audience :: Developers",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python :: 3",
+    ],
     zip_safe=False,
+    include_package_data=True,
 )

schemas/australiapost/setup.py

@@ -1,12 +1,26 @@
 """Warning: This setup.py is only there for git install until poetry support git subdirectory"""
-
 from setuptools import setup, find_packages
 
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
 setup(
     name="carrier.australiapost",
-    version="0.0.0-dev",
+    version="2021.3",
+    description="Australia Post API Schemas Python Data Types library",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    url="https://github.com/karrioapi/karrio",
+    author="Karrio",
+    author_email="hello@karrio.io",
     license="Apache-2.0",
     packages=find_packages(),
     install_requires=["jstruct"],
+    classifiers=[
+        "Intended Audience :: Developers",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python :: 3",
+    ],
     zip_safe=False,
+    include_package_data=True,
 )