From d71ec3d15db0461c7fec7f98042fa55c2ac329d6 Mon Sep 17 00:00:00 2001
From: Jean-Kevin KPADEY <9912558+mivek@users.noreply.github.com>
Date: Tue, 20 Apr 2021 20:06:50 +0200
Subject: [PATCH] Fix deployment to Pypi (#11)

* Added `package_dir` in setup.cfg

* Fixed codacy
---
 .github/workflows/github_release.yml | 25 +++++++++++++++++++++++++
 .github/workflows/release.yml        | 23 +++--------------------
 CHANGELOG.md                         |  6 ++++++
 Makefile                             |  2 +-
 setup.cfg                            |  6 ++++--
 5 files changed, 39 insertions(+), 23 deletions(-)
 create mode 100644 .github/workflows/github_release.yml

diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml
new file mode 100644
index 0000000..ffe80f0
--- /dev/null
+++ b/.github/workflows/github_release.yml
@@ -0,0 +1,25 @@
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - '\d\.\d\.\d'
+
+name: Create a Github release
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: false
+          prerelease: false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5616610..bf6901d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,25 +4,9 @@ on:
     tags:
       - '\d\.\d\.\d'
 
-name: Create Release and publish to Pypi
+name: Publish to Pypi
 
 jobs:
-  build:
-    name: Create Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          draft: false
-          prerelease: false
   deploy:
     name: Deploy to PYPI
     runs-on: ubuntu-latest
@@ -41,10 +25,9 @@ jobs:
 
       - name: Build the archives
         run: |
-          python -m build
+          python -m build --sdist --wheel --outdir dist/
 
       - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@master
         with:
-          user: ${{ secrets.PYPI_USERNAME }}
           password: ${{ secrets.PYPI_PASSWORD }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9e9ff8..46d3f40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log 
 
+## [1.1.1] - 2021-04-20
+
+### Fixed
+
+-   Added packages source directory in `setup.cfg` to fix deployment.   
+
 ## [1.1.0] - 2021-03-20
 
 ### Added
diff --git a/Makefile b/Makefile
index e91f338..efabf96 100644
--- a/Makefile
+++ b/Makefile
@@ -30,4 +30,4 @@ install:
 
 install_deploy:
 	@echo "Install build/deployment dependencies"
-	${PYTHON} -m pip install --upgrade build twine
\ No newline at end of file
+	${PYTHON} -m pip install --upgrade build --user
diff --git a/setup.cfg b/setup.cfg
index 59c2f31..a2eeefe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = metar-taf-parser-mivek
-version = 1.1.0
+version = 1.1.1
 author = Jean-Kevin KPADEY
 author_email = jeankevin.kpadey@gmail.com
 description = Python project parsing metar and taf message
@@ -22,6 +22,8 @@ keywords =
     airport
 
 [options]
+package_dir =
+    = metar_taf_parser
 packages = find:
 python_requires = >=3.6
 tests_require =
@@ -29,4 +31,4 @@ tests_require =
     coverage
 
 [options.packages.find]
-where = src
\ No newline at end of file
+where = metar_taf_parser