Merge branch 'main' into quinna.halim/update-package-logic

.github/workflows/build_deploy.yml

@@ -77,25 +77,3 @@ jobs:
         run: python $GITHUB_WORKSPACE/tests/smoke_test.py
         # Move out of the workspace to avoid importing ddtrace from the source
         working-directory: /
-
-  upload_pypi:
-    needs:
-      - build_wheels
-      - test_alpine_sdist
-    runs-on: ubuntu-latest
-    if: (github.event_name == 'release' && github.event.action == 'published')
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          path: dist
-          merge-multiple: true
-
-      - uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_TOKEN }}
-          # To test: repository_url: https://test.pypi.org/legacy/
-          # Setting skip_existing will prevent the deploy from erring out early
-          # due to a duplicate wheel being present which will ensure that the rest
-          # of the wheels will be uploaded if some are uploaded manually.
-          skip_existing: true

.gitlab/release.yml

@@ -33,15 +33,15 @@ variables:
       - pywheels/*.whl
       - pywheels/*.tar.gz
 
-release_pypi_test:
+# Can be used to validate uploading of artifacts
+# release_pypi_test:
+#   extends: .release_pypi
+#   dependencies: [ "download_ddtrace_artifacts" ]
+#   variables:
+#     PYPI_REPOSITORY: testpypi
+
+release_pypi_prod:
   extends: .release_pypi
   dependencies: [ "download_ddtrace_artifacts" ]
   variables:
-    PYPI_REPOSITORY: testpypi
-
-# TODO: Replace GitHub Action PyPI upload with this job
-# release_pypi_prod:
-#   extends: .release_pypi
-#   needs: [ "release_pypi_test" ]
-#   variables:
-#     PYPI_REPOSITORY: pypi
+    PYPI_REPOSITORY: pypi

.riot/requirements/13fc59d.txt → .riot/requirements/10a00e7.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/13fc59d.in
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/10a00e7.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
@@ -11,12 +11,12 @@ exceptiongroup==1.2.2
 hypothesis==6.45.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.28.2
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pymongo==4.8.0
-pytest==8.3.2
+pytest==8.3.3
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0

.riot/requirements/63c9090.txt → .riot/requirements/1424e42.txt

@@ -2,20 +2,20 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/63c9090.in
+#    pip-compile --no-annotate .riot/requirements/1424e42.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
 dnspython==2.6.1
 hypothesis==6.45.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.28.2
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pymongo==4.8.0
-pytest==8.3.2
+pytest==8.3.3
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0

.riot/requirements/9627328.txt → .riot/requirements/14e85f3.txt

@@ -2,20 +2,20 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/9627328.in
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/14e85f3.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
 dnspython==2.6.1
 hypothesis==6.45.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.28.2
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pymongo==4.8.0
-pytest==8.3.2
+pytest==8.3.3
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0

.riot/requirements/c998f1e.txt → .riot/requirements/16cae33.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.7
 # by the following command:
 #
-#    pip-compile --allow-unsafe --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/c998f1e.in
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/16cae33.in
 #
 attrs==24.2.0
 coverage[toml]==7.2.7
@@ -12,7 +12,7 @@ hypothesis==6.45.0
 importlib-metadata==6.7.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.28.2
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.0
 pluggy==1.2.0

.riot/requirements/14fb6c4.txt → .riot/requirements/1ce9a99.txt

@@ -2,25 +2,25 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/14fb6c4.in
+#    pip-compile --no-annotate .riot/requirements/1ce9a99.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
 dnspython==2.6.1
 exceptiongroup==1.2.2
 hypothesis==6.45.0
-importlib-metadata==8.4.0
+importlib-metadata==8.5.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.28.2
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pymongo==4.8.0
-pytest==8.3.2
+pytest==8.3.3
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0
 sortedcontainers==2.4.0
 tomli==2.0.1
-zipp==3.20.1
+zipp==3.20.2

.riot/requirements/16d0967.txt → .riot/requirements/1ed6ce0.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.7
 # by the following command:
 #
-#    pip-compile --allow-unsafe --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/16d0967.in
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/1ed6ce0.in
 #
 attrs==24.2.0
 coverage[toml]==7.2.7
@@ -12,7 +12,7 @@ hypothesis==6.45.0
 importlib-metadata==6.7.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.28.2
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.0
 pluggy==1.2.0

.riot/requirements/f97f8c0.txt → .riot/requirements/328b28c.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/f97f8c0.in
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/328b28c.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
@@ -11,12 +11,12 @@ exceptiongroup==1.2.2
 hypothesis==6.45.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.28.2
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pymongo==4.8.0
-pytest==8.3.2
+pytest==8.3.3
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0

.riot/requirements/182cbd0.txt → .riot/requirements/ad40916.txt

@@ -2,20 +2,20 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/182cbd0.in
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/ad40916.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
 dnspython==2.6.1
 hypothesis==6.45.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.28.2
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pymongo==4.8.0
-pytest==8.3.2
+pytest==8.3.3
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0

.riot/requirements/541b4d9.txt → .riot/requirements/b089663.txt

@@ -2,25 +2,25 @@
 # This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/541b4d9.in
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/b089663.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
 dnspython==2.6.1
 exceptiongroup==1.2.2
 hypothesis==6.45.0
-importlib-metadata==8.4.0
+importlib-metadata==8.5.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.28.2
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pymongo==4.8.0
-pytest==8.3.2
+pytest==8.3.3
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0
 sortedcontainers==2.4.0
 tomli==2.0.1
-zipp==3.20.1
+zipp==3.20.2

.riot/requirements/172570f.txt → .riot/requirements/b344fed.txt

@@ -2,20 +2,20 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/172570f.in
+#    pip-compile --no-annotate .riot/requirements/b344fed.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
 dnspython==2.6.1
 hypothesis==6.45.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.28.2
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pymongo==4.8.0
-pytest==8.3.2
+pytest==8.3.3
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0

.riot/requirements/1dad05b.txt → .riot/requirements/de53117.txt

@@ -2,25 +2,25 @@
 # This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1dad05b.in
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/de53117.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
 dnspython==2.6.1
 exceptiongroup==1.2.2
 hypothesis==6.45.0
-importlib-metadata==8.4.0
+importlib-metadata==8.5.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.28.2
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pymongo==4.8.0
-pytest==8.3.2
+pytest==8.3.3
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0
 sortedcontainers==2.4.0
 tomli==2.0.1
-zipp==3.20.1
+zipp==3.20.2

.riot/requirements/178ae92.txt → .riot/requirements/f9d0e8e.txt

@@ -2,25 +2,25 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/178ae92.in
+#    pip-compile --no-annotate .riot/requirements/f9d0e8e.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
 dnspython==2.6.1
 exceptiongroup==1.2.2
 hypothesis==6.45.0
-importlib-metadata==8.4.0
+importlib-metadata==8.5.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.28.2
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pymongo==4.8.0
-pytest==8.3.2
+pytest==8.3.3
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0
 sortedcontainers==2.4.0
 tomli==2.0.1
-zipp==3.20.1
+zipp==3.20.2