Skip to content

Commit

Permalink
Merge pull request #8 from Adrixop95/feature/bump_requirements
Browse files Browse the repository at this point in the history
Bump project requirements
  • Loading branch information
Adrixop95 committed Sep 17, 2023
2 parents e63d338 + 25c13a6 commit 4da2d33
Show file tree
Hide file tree
Showing 7 changed files with 422 additions and 379 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker_build_development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v2

- name: Build and Publish latest Docker image
uses: VaultVulp/gp-docker-action@1.1.6
uses: VaultVulp/gp-docker-action@1.6.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
image-name: barcodegenerator
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_build_latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v2

- name: Build and Publish latest Docker image
uses: VaultVulp/gp-docker-action@1.1.6
uses: VaultVulp/gp-docker-action@1.6.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
image-name: barcodegenerator
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/python checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ name: Python Code Checks

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
matrix:
python-version: [3.8]
python-version: ['3.10']

steps:
- uses: actions/checkout@v2
Expand All @@ -20,10 +20,13 @@ jobs:

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libtiff5-dev libjpeg8-dev libopenjp2-7-dev zlib1g-dev \
libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \
libharfbuzz-dev libfribidi-dev libxcb1-dev
pip install poetry
poetry install --no-dev
poetry install
poetry add flake8
poetry add safety
poetry add PyLint
poetry show -v
Expand Down
11 changes: 8 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build image with Poetry
FROM python:3.8-slim as python-base
FROM python:3.10-slim as python-base

ENV PYTHONUNBUFFERED=1 \
PYTHONDONTWRITEBYTECODE=1 \
Expand All @@ -23,12 +23,17 @@ RUN apt-get update \
zbar-tools \
&& rm -rf /var/lib/apt/lists/*

RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
RUN curl -sSL https://install.python-poetry.org | python3 -

RUN apt-get update && \
apt-get install -y libtiff5-dev libjpeg62-turbo-dev libopenjp2-7-dev zlib1g-dev \
libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \
libharfbuzz-dev libfribidi-dev libxcb1-dev

WORKDIR $PYSETUP_PATH
COPY poetry.lock pyproject.toml ./

RUN poetry install --no-dev
RUN poetry install
RUN pip install uvloop

# Production image
Expand Down
2 changes: 1 addition & 1 deletion app/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from app.api.api_router import api_router

app = FastAPI(root_path="/api/v1", version="0.1.5")
app = FastAPI(root_path="/api/v1", version="0.1.6")

app.add_middleware(
CORSMiddleware,
Expand Down
769 changes: 402 additions & 367 deletions poetry.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[tool.poetry]
name = "barcode-service"
version = "0.1.5"
version = "0.1.6"
description = "Simple and small python service designed to generate and read Barcode, QRCode, Aztec Code, DataMatrix."
authors = ["adrixop95 <adrixop95@me.com>"]
license = "GPL-3.0"

[tool.poetry.dependencies]
python = "^3.8"
python = "^3.10"
uvicorn = "^0.12.1"
aiofiles = "^0.5.0"
aztec-code-generator = "^0.3"
Expand Down

0 comments on commit 4da2d33

Please sign in to comment.