Merge branch 'release-v54.0.0' into release

mozilla · Sep 13, 2023 · 5d8f4b2 · 5d8f4b2
2 parents b8cf10d + 1cfbc01
commit 5d8f4b2
Show file tree

Hide file tree

Showing 97 changed files with 1,368 additions and 965 deletions.
diff --git a/.buildconfig.yml b/.buildconfig.yml
@@ -1,4 +1,4 @@
-libraryVersion: 53.2.0
+libraryVersion: 54.0.0
 groupId: org.mozilla.telemetry
 projects:
   glean:

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -161,11 +161,7 @@ commands:
       - run:
           name: Build Windows wheel
           command: |
-            cd glean-core/python
-            .venv3.8/bin/python3 setup.py bdist_wheel
-          environment:
-            GLEAN_BUILD_TARGET: x86_64-pc-windows-gnu
-            GLEAN_BUILD_VARIANT: release
+            make build-python-wheel CARGO_BUILD_TARGET=x86_64-pc-windows-gnu
 
   build-windows-i686-wheel:
     steps:
@@ -179,11 +175,7 @@ commands:
       - run:
           name: Build Windows wheel
           command: |
-            cd glean-core/python
-             .venv3.8/bin/python3 setup.py bdist_wheel
-          environment:
-            GLEAN_BUILD_TARGET: i686-pc-windows-gnu
-            GLEAN_BUILD_VARIANT: release
+            make build-python-wheel CARGO_BUILD_TARGET=i686-pc-windows-gnu
 
   install-python-windows-deps:
     steps:
@@ -201,7 +193,7 @@ commands:
             # requirements_dev.txt
             find ~/.cache/pip -name "*.whl" -exec $WINPYTHON -m pip install {} \;
             $WINPYTHON -m pip install -r glean-core/python/requirements_dev.txt --no-warn-script-location
-            $WINPYTHON -m pip install glean-core/python/dist/*.whl --no-warn-script-location
+            $WINPYTHON -m pip install target/wheels/*.whl --no-warn-script-location
 
   install-mingw:
     steps:
@@ -712,25 +704,6 @@ jobs:
           name: Python lints
           command: make lint-python
 
-  Python 3_6 tests:
-    docker:
-      - image: cimg/python:3.6
-    steps:
-      - checkout
-      - skip-if-doc-only
-      - test-python
-
-  Python 3_6 tests minimum dependencies:
-    docker:
-      - image: cimg/python:3.6
-    steps:
-      - checkout
-      - skip-if-doc-only
-      - run:
-          command: |
-            echo "export GLEAN_PYDEPS=min" >> $BASH_ENV
-      - test-python
-
   Python 3_7 tests:
     docker:
       - image: cimg/python:3.7
@@ -753,17 +726,6 @@ jobs:
       - checkout
       - test-python
 
-  Python 3_9 tests minimum dependencies:
-    docker:
-      - image: cimg/python:3.9
-    steps:
-      - checkout
-      - skip-if-doc-only
-      - run:
-          command: |
-            echo "export GLEAN_PYDEPS=min" >> $BASH_ENV
-      - test-python
-
   Python 3_9 on Alpine tests:
     docker:
       - image: python:3.9-alpine
@@ -785,7 +747,7 @@ jobs:
       - checkout
       - test-python
       - persist_to_workspace:
-          root: glean-core/python/
+          root: .
           paths: .venv3.10
 
   Python Windows x86_64 tests:
@@ -842,12 +804,15 @@ jobs:
     docker:
       - image: cimg/python:3.10
     steps:
+      - install-rustup
+      - setup-rust-toolchain
       - checkout
       - attach_workspace:
-          at: glean-core/python/
+          at: .
       - run:
           name: Generate Python docs
-          command: glean-core/python/.venv3.10/bin/python3 -m pdoc --html glean --force -o build/docs/python
+          command: |
+            make docs-python
       - persist_to_workspace:
           root: build/
           paths: docs/python
@@ -864,11 +829,19 @@ jobs:
           command: |
             echo 'export PATH=/opt/python/cp38-cp38/bin:$PATH' >> $BASH_ENV
       - run:
-          name: Build Python extension
+          name: Setup Python env
           command: |
             make setup-python
-            glean-core/python/.venv3.8/bin/python3 setup.py sdist
-            glean-core/python/.venv3.8/bin/python3 -m twine upload dist/*
+      - run:
+          name: Build Python source distribution
+          command: |
+            make build-python-sdist
+      - run:
+          name: Upload Linux source distribution
+          command: |
+            # Requires that the TWINE_USERNAME and TWINE_PASSWORD environment
+            # variables are configured in CircleCI's environment variables.
+            .venv3.8/bin/python3 -m twine upload target/wheels/*
 
   pypi-linux-release:
     docker:
@@ -887,28 +860,25 @@ jobs:
           command: |
             echo 'export PATH=/opt/python/cp38-cp38/bin:$PATH' >> $BASH_ENV
       - run:
-          name: Build Python extension
+          name: Setup Python env
           command: |
-            make build-python
-          environment:
-            GLEAN_BUILD_VARIANT: release
+            make setup-python
+      - run:
+          name: Build Python package
+          command: |
+            make build-python-wheel
       - run:
-          name: Build Linux wheel
+          name: Upload Linux wheel
           command: |
-            cd glean-core/python
-            .venv3.8/bin/python3 setup.py bdist_wheel
-            .venv3.8/bin/python3 -m auditwheel repair dist/*.whl
             # Requires that the TWINE_USERNAME and TWINE_PASSWORD environment
             # variables are configured in CircleCI's environment variables.
-            .venv3.8/bin/python3 -m twine upload wheelhouse/*
-          environment:
-            GLEAN_BUILD_VARIANT: release
+            .venv3.8/bin/python3 -m twine upload target/wheels/*
       - install-ghr-linux
       - run:
           name: Publish to Github
           command: |
             # Upload to GitHub
-            ./ghr -replace ${CIRCLE_TAG} glean-core/python/wheelhouse
+            ./ghr -replace ${CIRCLE_TAG} dist
 
   pypi-macos-release:
     macos:
@@ -926,41 +896,27 @@ jobs:
       - run:
           name: Build macOS x86_64 wheel
           command: |
-            cd glean-core/python
-            .venv3.11/bin/python3 setup.py bdist_wheel
-          environment:
-            GLEAN_BUILD_TARGET: x86_64-apple-darwin
-            GLEAN_BUILD_VARIANT: release
+            make build-python-wheel CARGO_BUILD_TARGET=x86_64-apple-darwin
       - run:
           name: Build macOS aarch64 wheel
           command: |
-            cd glean-core/python
-            .venv3.11/bin/python3 setup.py bdist_wheel
-          environment:
-            SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
-            GLEAN_BUILD_TARGET: aarch64-apple-darwin
-            GLEAN_BUILD_VARIANT: release
+            make build-python-wheel CARGO_BUILD_TARGET=aarch64-apple-darwin
       - run:
           name: Build macOS universal2 wheel
           command: |
-            cd glean-core/python
-            .venv3.11/bin/python3 setup.py bdist_wheel
-          environment:
-            GLEAN_BUILD_TARGET: universal
-            GLEAN_BUILD_VARIANT: release
+            make build-python-wheel MATURIN_FLAG=--universal2
       - run:
           name: Upload wheels to PyPI
           command: |
-            cd glean-core/python
             # Requires that the TWINE_USERNAME and TWINE_PASSWORD environment
             # variables are configured in CircleCI's environment variables.
-            .venv3.11/bin/python3 -m twine upload dist/*
+            .venv3.11/bin/python3 -m twine upload target/wheels/*
       - install-ghr-darwin
       - run:
           name: Publish to Github
           command: |
             # Upload to GitHub
-            ./ghr -replace ${CIRCLE_TAG} glean-core/python/dist
+            ./ghr -replace ${CIRCLE_TAG} dist
 
   pypi-windows-x86_64-release:
     docker:
@@ -971,16 +927,15 @@ jobs:
       - run:
           name: Upload to PyPI
           command: |
-            cd glean-core/python
             # Requires that the TWINE_USERNAME and TWINE_PASSWORD environment
             # variables are configured in CircleCI's environment variables.
-            .venv3.8/bin/python3 -m twine upload dist/*
+            .venv3.8/bin/python3 -m twine upload target/wheels/*
       - install-ghr-linux
       - run:
           name: Publish to Github
           command: |
             # Upload to GitHub
-            ./ghr -replace ${CIRCLE_TAG} glean-core/python/dist
+            ./ghr -replace ${CIRCLE_TAG} dist
 
   pypi-windows-i686-release:
     docker:
@@ -991,16 +946,15 @@ jobs:
       - run:
           name: Upload to PyPI
           command: |
-            cd glean-core/python
             # Requires that the TWINE_USERNAME and TWINE_PASSWORD environment
             # variables are configured in CircleCI's environment variables.
-            .venv3.8/bin/python3 -m twine upload dist/*
+            .venv3.8/bin/python3 -m twine upload target/wheels/*
       - install-ghr-linux
       - run:
           name: Publish to Github
           command: |
             # Upload to GitHub
-            ./ghr -replace ${CIRCLE_TAG} glean-core/python/dist
+            ./ghr -replace ${CIRCLE_TAG} dist
 
   ###########################################################################
   # Docs
@@ -1126,18 +1080,12 @@ workflows:
           filters:
             branches:
               only: main
-      - Python 3_6 tests:
-          filters: *ci-filters
-      - Python 3_6 tests minimum dependencies:
-          filters: *ci-filters
       - Python 3_7 tests:
           filters: *ci-filters
       - Python 3_8 tests:
           filters: *ci-filters
       - Python 3_9 tests:
           filters: *ci-filters
-      - Python 3_9 tests minimum dependencies:
-          filters: *ci-filters
       - Python 3_9 on Alpine tests:
           filters: *ci-filters
       - Python 3_10 tests:

diff --git a/.coveragerc b/.coveragerc
diff --git a/.dictionary b/.dictionary
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 268 utf-8
+personal_ws-1.1 en 270 utf-8
 AAR
 AARs
 ABI
@@ -25,6 +25,7 @@ Dependabot
 Droettboom
 FOG
 FTE
+FeatureManifest
 Fenix
 Fournier
 Frictionless
@@ -188,6 +189,7 @@ logPings
 logcat
 macOS
 manylinux
+maturin
 md
 mdbook
 mdroettboom

diff --git a/.flake8 b/.flake8
diff --git a/.flake8rc b/.flake8rc
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -15,3 +15,7 @@ updates:
     ignore:
       # Updated in lockstep across all implementations
       - dependency-name: "glean_parser"
+    groups:
+      python-packages:
+        patterns:
+          - "*"
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,7 @@ raw_xcode*log
 # Python stuff
 *.egg-info
 dist/
+.venv*/
 
 # Wine stuff
 winpython/
@@ -42,10 +43,11 @@ samples/python/.venv*/
 samples/python/data
 .mypy_cache/
 .coverage
+.coverage*
 htmlcov/
 *.log
 
-glean-core/python/glean/_uniffi.py
+glean-core/python/glean/_uniffi
 __pycache__
 *.py[cod]
 .Python

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla/glean/compare/v53.2.0...main)
+[Full changelog](https://github.com/mozilla/glean/compare/v54.0.0...main)
+
+# v54.0.0 (2023-09-12)
+
+[Full changelog](https://github.com/mozilla/glean/compare/v53.2.0...v54.0.0)
+
+* General
+  * Experimental: Add configuration to add a wall clock timestamp to all events ([#2513](https://github.com/mozilla/glean/issues/2513))
+* Python
+  * Switched the build system to maturin. This should not have any effect on consumers. ([#2345](https://github.com/mozilla/glean/pull/2345))
+  * BREAKING CHANGE: Dropped support for Python 3.6 ([#2345](https://github.com/mozilla/glean/pull/2345))
+* Kotlin
+  * Update to Gradle v8.2.1 ([#2516](https://github.com/mozilla/glean/pull/2516))
+  * Increase Android compile SDK to version 34 ([#2614](https://github.com/mozilla/glean/pull/2614))
 
 # v53.2.0 (2023-08-02)
 
@@ -11,7 +24,7 @@
 * Rust
   * The Ping Rate Limit type is now accessible in the Rust Language Binding ([#2528](https://github.com/mozilla/glean/pull/2528))
   * Gracefully handle a failure when starting the upload thread. Glean no longer crashes in that case. ([#2545](https://github.com/mozilla/glean/pull/2545))
-  * `locale` now exposed through the RLB so it can be set by consumers ([2531](https://github.com/mozilla/glean/pull/2531))
+  * `locale` now exposed through the RLB so it can be set by consumers ([#2531](https://github.com/mozilla/glean/pull/2531))
 * Python
   * Added the shutdown API for Python to ensure orderly shutdown and waiting for uploader processes ([#2538](https://github.com/mozilla/glean/pull/2538))
 * Kotlin
@@ -265,9 +278,6 @@
 * Swift
   * Fix for iOS startup crash caused by Glean ([#2206](https://github.com/mozilla/glean/pull/2206))
 
-* Swift
-  * Fix for iOS startup crash caused by Glean ([#2206](https://github.com/mozilla/glean/pull/2206))
-
 # v51.3.0 (2022-09-28)
 
 [Full changelog](https://github.com/mozilla/glean/compare/v51.2.0...v51.3.0)