release(1.3.4): Bump development dependencies and re-build documentation

.github/workflows/pipeline.yml

@@ -3,6 +3,7 @@ name: CI & CD
 on:
   push:
     branches:
+      - main
       - master
   pull_request:
 
@@ -14,20 +15,21 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
+        python-version: ['3.6.15']
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
         with:
-          python-version: '3.6.15'
+          python-version: ${{ matrix.python-version }}
       - name: deps
         timeout-minutes: 1
         run: sh pyscript.sh install
       - name: security-analysis
         timeout-minutes: 1
-        run: sh pyscript.sh security_analysis
+        run: sh pyscript.sh security-analysis
       - name: static-analysis
         timeout-minutes: 1
-        run: sh pyscript.sh static_analysis
+        run: sh pyscript.sh static-analysis
       - name: test
         timeout-minutes: 3
         run: sh pyscript.sh test
@@ -36,18 +38,19 @@ jobs:
         run: sh pyscript.sh clean
 
   CD:
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
     needs: CI
     timeout-minutes: 15
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ ubuntu-latest ]
+        python-version: ['3.6.15']
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
         with:
-          python-version: '3.6.15'
+          python-version: ${{ matrix.python-version }}
       - name: deps
         timeout-minutes: 1
         run: sh pyscript.sh install

.pre-commit-config.yaml

@@ -9,12 +9,12 @@ repos:
         stages: [ commit-msg ]
       - id: security-analysis
         name: security-analysis
-        entry: sh pyscript.sh security_analysis
+        entry: sh pyscript.sh security-analysis
         language: system
         stages: [ commit-msg ]
       - id: static-analysis
         name: static-analysis
-        entry: sh pyscript.sh static_analysis
+        entry: sh pyscript.sh static-analysis
         language: system
         stages: [ commit-msg ]
   - repo: https://github.com/pre-commit/pre-commit-hooks

Dockerfile

@@ -1,14 +1,24 @@
-FROM docker.io/library/python:3.6.15-slim as development
+FROM docker.io/library/python:3.6.15-slim AS production
 
 WORKDIR /app
 
-RUN apt update && apt install -y gcc
+COPY LICENSE pyproject.toml pyscript.sh README.md requirements.txt setup.py ./
 
-COPY .pre-commit-config.yaml LICENSE pyproject.toml pyscript.sh README.md requirements.txt requirements-dev.txt setup.py ./
-COPY aioddd ./aioddd/
-COPY tests ./tests/
+RUN apt update -y && python3 -m pip install --upgrade pip
 
-RUN sh pyscript.sh install
+COPY aioddd ./aioddd/
 
 ENTRYPOINT ["sh", "pyscript.sh"]
 CMD []
+
+FROM production AS development
+
+RUN apt install -y gcc
+
+COPY .pre-commit-config.yaml requirements-dev.txt ./
+
+RUN sh pyscript.sh install
+
+COPY docs ./docs
+COPY docs_src ./docs_src
+COPY tests ./tests

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Denis NA
+Copyright (c) 2020 - 2022 aiopy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -12,7 +12,7 @@ pip install aioddd
 
 ## Documentation
 
-- Visit [aioddd docs](https://ticdenis.github.io/python-aioddd/).
+- Visit [aioddd docs](https://aiopy.github.io/python-aioddd/).
 
 ## Usage
 
@@ -85,4 +85,4 @@ Please make sure to update tests as appropriate.
 
 ## License
 
-[MIT](https://github.com/ticdenis/python-aioddd/blob/master/LICENSE)
+[MIT](https://github.com/aiopy/python-aioddd/blob/master/LICENSE)

aioddd/__init__.py

@@ -97,3 +97,5 @@
     'Timestamp',
     'StrDateTime',
 )
+
+__version__ = '1.3.4'

aioddd/events.py

@@ -53,7 +53,7 @@ def encode(self, msg: Event) -> Dict[str, Any]:
         }
 
     def decode(self, data: Dict[str, Any]) -> Event:
-        attributes = self.event_type.Attributes(**data['attributes'])  # type: ignore
+        attributes = self.event_type.Attributes(**data['attributes'])
         meta = self.event_type.Meta(id=data['id'], type=data['type'], occurred_on=data['occurred_on'])
         return self.event_type(attributes=attributes, meta=meta)
 

docker-compose.yml

@@ -1,10 +1,10 @@
 services:
-  test:
+  aioddd:
     build:
       context: .
       dockerfile: Dockerfile
       target: development
-    command: coverage
+    image: ghcr.io/aiopy/python-aioddd:${VERSION:-latest}
     volumes:
       - .:/app