From e980faa6b6d8b98800272af94642c53d2b34db87 Mon Sep 17 00:00:00 2001
From: Eugen Ciur <eugen@papermerge.com>
Date: Fri, 22 Dec 2023 08:30:14 +0100
Subject: [PATCH] update CI

---
 .github/workflows/publish.yml      | 13 +++++++++
 .github/workflows/version_bump.yml | 46 ------------------------------
 CHANGELOG.md                       |  6 ++++
 README.md                          |  2 +-
 4 files changed, 20 insertions(+), 47 deletions(-)
 create mode 100644 .github/workflows/publish.yml
 delete mode 100644 .github/workflows/version_bump.yml

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 0000000..3c9e7b6
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,13 @@
+name: Publish pacakge to pypi
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  publish-to-pypi:
+    name: Publish to Pypi
+    uses: papermerge/papermerge-core/.github/workflows/publish-to-pypi.yml@master
+    secrets:
+      PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
diff --git a/.github/workflows/version_bump.yml b/.github/workflows/version_bump.yml
deleted file mode 100644
index 16ee11e..0000000
--- a/.github/workflows/version_bump.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: Generate changelog and publish pacakge to pypi
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  generate-changelog:
-    runs-on: ubuntu-latest
-    outputs:
-      old-version: ${{ steps.step-version-bump.outputs.OLD_VERSION }}
-      new-version: ${{ steps.step-version-bump.outputs.NEW_VERSION }}
-    steps:
-      - uses: actions/checkout@master
-
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-
-      - name: Generate Changelog
-        run: |
-          python -m pip install --upgrade pip
-          pip install towncrier
-          # will remove files from changelog.d/ and update changelog.md file
-          towncrier build --version ${{ github.ref_name }} --yes
-
-      - name: Commit files
-        run: |
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git commit -m "changelog for ${{ github.ref_name }}" -a
-
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
-
-  publish-to-pypi:
-    name: Publish to Pypi
-    needs: [ "generate-changelog" ]
-    uses: papermerge/papermerge-core/.github/workflows/publish-to-pypi.yml@master
-    secrets:
-      PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fca6a7c..4d84f83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,12 @@ can be found in [changelog.d folder](https://github.com/papermerge/papermerge-cl
 
 <!-- towncrier release notes start -->
 
+## 0.7.0 - 2023-12-22
+
+- pydantic dependency upgraded from 1.x to v2.5
+- `import` command fixed to work with REST API version 3.0 (Papermerge DMS 3.0)
+- `server-version` command added (returns version of server REST API)
+
 ## 0.3.3 - 2022-12-24
 
 
diff --git a/README.md b/README.md
index 0267e33..84f7517 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ interpreter. In order to install `pip` on Ubuntu use following command:
 REST API column - is version of Papermerge REST API server. This value
 you can get from:
 
-    $ papermerge-cli --server-version
+    $ papermerge-cli server-version
 
 CLI column - is version of papermege-cli command line utility. This value
 you can get from: