Skip testpypi upload for meta package.

Author: tillahoffmann

.github/workflows/main.yml

@@ -6,32 +6,6 @@ on:
     branches: [master]
 
 jobs:
-  sphinx:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup python 3.10
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.10"
-      - name: Cache Python dependencies
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('requirements/3.10.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
-      - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install wheel
-          pip install -r requirements/3.10.txt
-      - name: Build documentation
-        run: sphinx-build -nW . docs/_build
-      - name: Run doctests
-        run: sphinx-build -b doctest . docs/_build
-
   build:
     strategy:
       fail-fast: false
@@ -41,7 +15,7 @@ jobs:
           - "3.8"
           - "3.9"
           - "3.10"
-        test-component:
+        component:
           - arangodb
           - azurite
           - clickhouse
@@ -85,7 +59,7 @@ jobs:
           pip install --upgrade pip
           pip install -r requirements/${{ matrix.python-version }}.txt
       - name: Run docker diagnostics
-        if: matrix.test-component == 'core'
+        if: matrix.component == 'core'
         run: |
           echo "Build minimal container for docker-in-docker diagnostics"
           docker build -f Dockerfile.diagnostics -t testcontainers-python .
@@ -96,13 +70,13 @@ jobs:
           echo "Container diagnostics with host network"
           docker run --rm -v /var/run/docker.sock:/var/run/docker.sock --network=host testcontainers-python python diagnostics.py
       - name: Lint the code
-        run: make ${{ matrix.test-component }}/lint
+        run: make ${{ matrix.component }}/lint
       - name: Run tests
-        if: matrix.test-component != 'meta'
-        run: make ${{ matrix.test-component }}/tests
+        if: matrix.component != 'meta'
+        run: make ${{ matrix.component }}/tests
       - name: Build the package
-        run: make ${{ matrix.test-component }}/dist
-      - name: Publish the package to pypi
+        run: make ${{ matrix.component }}/dist
+      - name: Upload the package to pypi
         if: >
           github.event_name == 'push'
           && github.ref == 'refs/heads/master'
@@ -111,5 +85,4 @@ jobs:
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
-          TWINE_REPOSITORY: pypi
-        run: make ${{ matrix.test-component }}/publish
+        run: make ${{ matrix.component }}/upload

.gitignore

@@ -71,3 +71,4 @@ venv
 
 .DS_Store
 .python-version
+.env

Makefile

@@ -3,7 +3,6 @@ PYTHON_VERSION ?= 3.10
 IMAGE = testcontainers-python:${PYTHON_VERSION}
 REQUIREMENTS = $(addprefix requirements/,${PYTHON_VERSIONS:=.txt})
 RUN = docker run --rm -it
-TWINE_REPOSITORY ?= testpypi
 # Get all directories that contain a setup.py and get the directory name.
 PACKAGES = $(subst /,,$(dir $(wildcard */setup.py)))
 
@@ -34,8 +33,13 @@ ${LINT} : %/lint :
 	flake8 $*
 
 # Targets to publish packages.
+upload : ${UPLOAD}
 ${UPLOAD} : %/upload :
-	twine upload --non-interactive --repository=${TWINE_REPOSITORY} --skip-existing $*/dist/*
+	if [ ${TWINE_REPOSITORY}-$* = testpypi-meta ]; then \
+		echo "Cannot upload meta package to testpypi because of missing permissions."; \
+	else \
+		twine upload --non-interactive --skip-existing $*/dist/*; \
+	fi
 
 # Targets to build docker images
 image: requirements/${PYTHON_VERSION}.txt