Updating the release process, and validating credentials are active (#386)

* pypi release improvements, and credential checks

* deps updates along the way

Author: chayim

.github/workflows/check-pypi.yml

@@ -0,0 +1,27 @@
+name: Check if required secrets are set to publish to Pypi
+
+on:
+  schedule:
+    cron: '5 5 * * *'
+
+jobs:
+  checksecret:
+    name: check if PYPI_TOKEN and TESTPYPI_TOKEN are set in github secrets
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check PYPI_TOKEN
+        env:
+          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+        run: |
+          if ${{ env.PYPI_TOKEN == '' }} ; then
+            echo "PYPI_TOKEN secret is not set"
+            exit 1
+          fi
+      - name: Check TESTPYPI_TOKEN
+        env:
+          TESTPYPI_TOKEN: ${{ secrets.TESTPYPI_TOKEN }}
+        run: |
+          if ${{ env.TESTPYPI_TOKEN == '' }} ; then
+            echo "TESTPYPI_TOKEN secret is not set"
+            exit 1
+          fi

.github/workflows/ci.yml

@@ -147,54 +147,3 @@ jobs:
           flags: unit
           env_vars: OS
           fail_ci_if_error: false
-
-  deploy:
-    name: Deploy
-    runs-on: ubuntu-latest
-    needs: test-unix
-    # Run only on pushing a tag
-    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup Python 3.9
-        uses: actions/[email protected]
-        with:
-          python-version: 3.9
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-          installer-parallel: true
-          #----------------------------------------------
-          #       load cached venv if cache exists
-          #----------------------------------------------
-      - name: Load cached venv
-        id: cached-poetry-dependencies
-        uses: actions/cache@v3
-        with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
-        #----------------------------------------------
-        # Make sync version of library (redis_om)
-        #----------------------------------------------
-      - name: Make sync version of library (redis_om)
-        run: make sync
-        #----------------------------------------------
-        # install dependencies if cache does not exist
-        #----------------------------------------------
-      - name: Install dependencies
-        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-        run: poetry install --no-interaction --no-root
-        #----------------------------------------------
-        # install your root project, if required
-        #----------------------------------------------
-      - name: Install library
-        run: poetry install --no-interaction
-      - name: PyPI upload
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
-        run: |
-          make upload

.github/workflows/pypi-publish.yaml

@@ -0,0 +1,59 @@
+name: Publish Pypi
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  pytest:
+    name: Publish to PyPi
+    runs-on: ubuntu-latest
+    env:
+      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+    steps:
+      - uses: actions/checkout@master
+
+      - name: get version from tag
+        id: get_version
+        run: |
+          realversion="${GITHUB_REF/refs\/tags\//}"
+          realversion="${realversion//v/}"
+          echo "::set-output name=VERSION::$realversion"
+
+      - name: Set the version for publishing
+        uses: ciiiii/[email protected]
+        with:
+          file: "pyproject.toml"
+          key: "tool.poetry.version"
+          value: "${{ steps.get_version.outputs.VERSION }}"
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.9
+
+      - name: Cache Poetry virtualenv
+        uses: actions/cache@v1
+        id: cache
+        with:
+          path: ~/.virtualenvs
+          key: poetry-${{ hashFiles('**/poetry.lock') }}
+          restore-keys: |
+            poetry-${{ hashFiles('**/poetry.lock') }}
+
+      - name: Set Poetry config
+        run: |
+          pip install --upgrade pip python poetry
+          poetry config virtualenvs.in-project false
+          poetry config virtualenvs.path ~/.virtualenvs
+          poetry export --dev --without-hashes -o requirements.txt
+          pip install -r requirements.txt
+
+      - name: Make sync version of library (redis_om)
+        run: make sync
+
+      - name: Install
+        run: poetry install --no-interaction
+
+      - name: Publish to PyPI
+        run: |
+          poetry publish -u __token__ -p ${{ secrets.PYPI_TOKEN }} --build

Makefile

@@ -20,7 +20,6 @@ help:
 	@echo "  redis       start a Redis instance with Docker"
 	@echo "  sync        generate modules redis_om, tests_sync from aredis_om, tests respectively"
 	@echo "  dist        build a redis-om package"
-	@echo "  upload      upload a redis-om package to PyPI"
 	@echo "  all         equivalent to \"make lint format test\""
 	@echo ""
 	@echo "Check the Makefile to know exactly what each target is doing."
@@ -50,18 +49,13 @@ dist: $(INSTALL_STAMP) clean sync
 sync: $(INSTALL_STAMP)
 	$(POETRY) run python make_sync.py
 
-.PHONY: upload
-upload: dist
-	$(POETRY) run twine upload dist/*
-
 .PHONY: lint
 lint: $(INSTALL_STAMP) dist
 	$(POETRY) run isort --profile=black --lines-after-imports=2 ./tests/ $(NAME) $(SYNC_NAME)
 	$(POETRY) run black ./tests/ $(NAME)
 	$(POETRY) run flake8 --ignore=W503,E501,F401,E731 ./tests/ $(NAME) $(SYNC_NAME)
 	$(POETRY) run mypy ./tests/ $(NAME) $(SYNC_NAME) --ignore-missing-imports
 	$(POETRY) run bandit -r $(NAME) $(SYNC_NAME) -s B608
-	$(POETRY) run twine check dist/*
 
 .PHONY: format
 format: $(INSTALL_STAMP) sync