Merge branch 'fix-pypi-upload' into 'master'

Fix PyPI upload See merge request ogs/ogs!4828
ufz · Dec 1, 2023 · bfb70c6 · bfb70c6
2 parents 6d61f71 + faa0245
commit bfb70c6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -213,7 +213,6 @@
         "OGS_INSTALL_DEPENDENCIES": "OFF",
         "OGS_USE_PIP": "OFF",
         "OGS_USE_MFRONT": "ON",
-        "DOGS_BUILD_PROCESSES": "SteadyStateDiffusion",
         "BUILD_SHARED_LIBS": "ON"
       }
     }

diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,6 +29,8 @@ metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
 minimum-version = "0.5.0"
 ninja.make-fallback = false
 wheel.packages = ["Applications/Python/ogs"]
+sdist.exclude = ["Tests/Data", "web"]
+sdist.include = ["web/data/versions.json"]
 
 [tool.scikit-build.metadata.scripts]
 provider = "scripts"

diff --git a/scripts/ci/jobs/build-wheels.yml b/scripts/ci/jobs/build-wheels.yml
@@ -8,13 +8,14 @@ workflow:
     - if: $CI_COMMIT_TAG
       variables:
         PYPI_REPO: --repository pypi
-        # TODO: does not work:
-        PYPI_AUTH: --username __token__ --password "${PYPI_TOKEN}"
+        PYPI_USER: __token__
+        PYPI_PW: "${PYPI_TOKEN}"
         GIT_DEPTH: 1000
     - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
       variables:
         PYPI_REPO: --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi
-        PYPI_AUTH: --username gitlab-ci-token --password ${CI_JOB_TOKEN}
+        PYPI_USER: gitlab-ci-token
+        PYPI_PW: "${CI_JOB_TOKEN}"
         SETUPTOOLS_SCM_LOCAL_SCHEME: no-local-version
         GIT_DEPTH: 1000
     - if: $CI_MERGE_REQUEST_ID
@@ -80,7 +81,7 @@ publish wheels:
     - >
       pipx run twine upload
       ${PYPI_REPO}
-      ${PYPI_AUTH}
+      --username ${PYPI_USER} --password ${PYPI_PW}
       wheelhouse/*
 
 test notebooks via wheel: