[TESTING] glean_parser from git

mozilla · Nov 22, 2024 · 79cc41c · 79cc41c
1 parent 7a20b74
commit 79cc41c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/glean-core/build/src/lib.rs b/glean-core/build/src/lib.rs
@@ -39,8 +39,6 @@ use std::{env, path::PathBuf};
 
 use xshell_venv::{Result, Shell, VirtualEnv};
 
-const GLEAN_PARSER_VERSION: &str = "15.2.0";
-
 /// A Glean Rust bindings generator.
 pub struct Builder {
     files: Vec<String>,
@@ -114,7 +112,7 @@ impl Builder {
         } else {
             let venv = VirtualEnv::new(&sh, "py3-glean_parser")?;
 
-            let glean_parser = format!("glean_parser~={GLEAN_PARSER_VERSION}");
+            let glean_parser = "git+ssh://git@github.com/mozilla/glean_parser@follows-collection-enabled#egg=glean_parser".to_string();
             // TODO: Remove after we switched glean_parser away from legacy setup.py
             venv.pip_install("setuptools")?;
             venv.pip_install(&glean_parser)?;

diff --git a/glean-core/ios/sdk_generator.sh b/glean-core/ios/sdk_generator.sh
@@ -159,7 +159,7 @@ VENVDIR="${SOURCE_ROOT}/.venv"
 # We need at least pip 20.3 for Big Sur support, see https://pip.pypa.io/en/stable/news/#id48
 # Latest pip is 21.0.1
 "${VENVDIR}"/bin/pip install "pip>=20.3"
-"${VENVDIR}"/bin/pip install --upgrade "glean_parser~=$GLEAN_PARSER_VERSION"
+"${VENVDIR}"/bin/pip install --upgrade "git+ssh://git@github.com/mozilla/glean_parser@follows-collection-enabled#egg=glean_parser"
 
 # Run the glinter
 # Turn its warnings into warnings visible in Xcode (but don't do for the success message)

diff --git a/glean-core/python/glean/__init__.py b/glean-core/python/glean/__init__.py
@@ -35,14 +35,17 @@
 parser_version_next_major = parser_version.bump_major()
 
 
-current_parser = VersionInfo.parse(glean_parser.__version__)
-if current_parser < parser_version or current_parser >= parser_version_next_major:
-    warnings.warn(
-        f"glean_sdk expected glean_parser ~= v{GLEAN_PARSER_VERSION}, "
-        f"found v{glean_parser.__version__}",
-        Warning,
-        stacklevel=1,
-    )
+try:
+    current_parser = VersionInfo.parse(glean_parser.__version__)
+    if current_parser < parser_version or current_parser >= parser_version_next_major:
+        warnings.warn(
+            f"glean_sdk expected glean_parser ~= v{GLEAN_PARSER_VERSION}, "
+            f"found v{glean_parser.__version__}",
+            Warning,
+            stacklevel=1,
+        )
+except Exception:
+    pass
 
 
 __all__ = [

diff --git a/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy b/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy
@@ -482,7 +482,7 @@ except:
                 if (parserVersion.matches("git.+")) {
                     conda "Miniconda3", "Miniconda3-py311_${MINICONDA_VERSION}", "64", [parserVersion]
                 } else {
-                    conda "Miniconda3", "Miniconda3-py311_${MINICONDA_VERSION}", "64", ["glean_parser~=${parserVersion}"]
+                    conda "Miniconda3", "Miniconda3-py311_${MINICONDA_VERSION}", "64", ["git+ssh://git@github.com/mozilla/glean_parser@follows-collection-enabled#egg=glean_parser"]
                 }
             }
             File envDir = new File(

diff --git a/pyproject.toml b/pyproject.toml
@@ -22,7 +22,7 @@ maintainers = [
 
 dependencies = [
   "semver>=2.13.0",
-  "glean_parser~=15.2",
+  "glean_parser @ git+ssh://git@github.com/mozilla/glean_parser@follows-collection-enabled#egg=glean_parser",
   "importlib_resources>=1.3; python_version=='3.8'"
 ]