fix build

.gitlab-ci.yml

@@ -16,25 +16,23 @@ cache:
   paths:
     - .cache/pip
 
-before_script:
-  - apt-get -y update
-  - command -v git || apt-get -y install git
-  - command -v python3 || apt-get -y install python3
-  - command -v pip3 || apt-get -y install python3-pip twine python3-build
-  - command -v curl || apt-get -y install curl
-  - command -v bsdtar || apt-get -y install libarchive-tools
-  - python3 -V  # Print out python version for debugging
-  - python3 -m venv || apt-get -y install python3-venv
-  - if [[ "$CI_COMMIT_BRANCH" != "main" ]]; then sed -i "s%git+https://gitlab.kit.edu/scc-net/netvs/api-generator.git@main%git+https://gitlab.kit.edu/scc-net/netvs/api-generator.git@${CI_COMMIT_BRANCH}%g" pyproject.toml; fi
-  - if [[ "$CI_COMMIT_BRANCH" == "devel" ]]; then export NETDB_ENDPOINT=${NETDB_DEVEL_ENDPOINT}; fi
-
-
 stages:
   - build
 
 build:
   stage: build
   resource_group: ${CI_COMMIT_BRANCH} # this prevents parallel (potentially racy) pipeline runs
+  before_script:
+    - apt-get -y update
+    - command -v git || apt-get -y install git
+    - command -v python3 || apt-get -y install python3
+    - command -v pip3 || apt-get -y install python3-pip twine python3-build
+    - command -v curl || apt-get -y install curl
+    - command -v bsdtar || apt-get -y install libarchive-tools
+    - python3 -V  # Print out python version for debugging
+    - python3 -m venv || apt-get -y install python3-venv
+    - if [[ "$CI_COMMIT_BRANCH" != "main" ]]; then sed -i "s%git+https://gitlab.kit.edu/scc-net/netvs/api-generator.git@main%git+https://gitlab.kit.edu/scc-net/netvs/api-generator.git@${CI_COMMIT_BRANCH}%g" pyproject.toml; fi
+    - if [[ "$CI_COMMIT_BRANCH" == "devel" ]]; then export NETDB_ENDPOINT=${NETDB_DEVEL_ENDPOINT}; fi
   script:
     - mkdir -p latest
     - "(curl -LsS \"${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/artifacts/${CI_COMMIT_BRANCH}/download?job=build&job_token=${CI_JOB_TOKEN}\" | bsdtar -xf - -C latest) || true"
@@ -42,7 +40,6 @@ build:
     - test -d latest/dist && export LATEST_API_VERSION=$(cd latest/dist; ls *.whl | sed -r 's/netdb_client-([0-9]+\.[0-9]+\.[0-9]+).*/\1/g')
     - test -d latest/dist && export POST_NUM=$(cd latest/dist; ls *.whl | sed -r 's/.*\.post([0-9]+).*/\1/g')
     - python3 -m build
-    - TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python3 -m twine upload --verbose --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi --skip-existing dist/*
   artifacts:
     paths:
       - dist/*
@@ -50,4 +47,19 @@ build:
   only:
     - main
     - devel
-    - fix-build
+
+upload:
+  stage: build
+  resource_group: ${CI_COMMIT_BRANCH} # this prevents parallel (potentially racy) pipeline runs
+  before_script:
+    - apt-get -y update
+    - command -v git || apt-get -y install git
+    - command -v twine || apt-get -y install twine
+  script:
+    - TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token twine upload --verbose --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi --skip-existing dist/*
+  needs:
+    - job: build
+      artifacts: true
+  only:
+    - main
+    - devel

pyproject.toml

@@ -15,3 +15,6 @@ dynamic = ["version"]
 
 [project.urls]
 homepage = 'https://gitlab.kit.edu/scc-net/netvs/netdb-client'
+
+[tool.setuptools.packages.find]
+include = ["netdb_client*"]