From 7b92e25114055afe14643f3090ea1782cab4e696 Mon Sep 17 00:00:00 2001
From: Ruben Arts <ruben.arts@hotmail.com>
Date: Wed, 21 Aug 2024 12:07:50 +0200
Subject: [PATCH] fix: satisfy when there is not pypi packages in the lockfile
 (#1862)

---
 src/lock_file/satisfiability.rs               |   5 +
 tests/add_tests.rs                            |  11 +-
 .../pypi-deps-not-in-lock/pixi.lock           | 432 ++++++++++++++++++
 .../pypi-deps-not-in-lock/pixi.toml           |   8 +
 4 files changed, 450 insertions(+), 6 deletions(-)
 create mode 100644 tests/satisfiability/pypi-deps-not-in-lock/pixi.lock
 create mode 100644 tests/satisfiability/pypi-deps-not-in-lock/pixi.toml

diff --git a/src/lock_file/satisfiability.rs b/src/lock_file/satisfiability.rs
index 87e794c87..7100fb69e 100644
--- a/src/lock_file/satisfiability.rs
+++ b/src/lock_file/satisfiability.rs
@@ -258,9 +258,14 @@ pub fn verify_environment_satisfiability(
         let indexes = rattler_lock::PypiIndexes::from(grouped_env.pypi_options());
         match locked_environment.pypi_indexes() {
             None => {
+                // Mismatch when there should be an index but there is not
                 if locked_environment
                     .version()
                     .should_pypi_indexes_be_present()
+                    && locked_environment
+                        .pypi_packages()
+                        .iter()
+                        .any(|(_platform, packages)| !packages.is_empty())
                 {
                     return Err(IndexesMismatch {
                         current: indexes,
diff --git a/tests/add_tests.rs b/tests/add_tests.rs
index 7ced7f6a1..409f4c30e 100644
--- a/tests/add_tests.rs
+++ b/tests/add_tests.rs
@@ -2,6 +2,11 @@ mod common;
 
 use std::str::FromStr;
 
+use crate::common::{
+    builders::{HasDependencyConfig, HasPrefixUpdateConfig},
+    package_database::{Package, PackageDatabase},
+    LockFileExt, PixiControl,
+};
 use pixi::{DependencyType, Project};
 use pixi_consts::consts;
 use pixi_manifest::{pypi::PyPiPackageName, FeaturesExt, SpecType};
@@ -10,12 +15,6 @@ use serial_test::serial;
 use tempfile::TempDir;
 use uv_normalize::ExtraName;
 
-use crate::common::{
-    builders::{HasDependencyConfig, HasPrefixUpdateConfig},
-    package_database::{Package, PackageDatabase},
-    LockFileExt, PixiControl,
-};
-
 /// Test add functionality for different types of packages.
 /// Run, dev, build
 #[tokio::test]
diff --git a/tests/satisfiability/pypi-deps-not-in-lock/pixi.lock b/tests/satisfiability/pypi-deps-not-in-lock/pixi.lock
new file mode 100644
index 000000000..319fa955e
--- /dev/null
+++ b/tests/satisfiability/pypi-deps-not-in-lock/pixi.lock
@@ -0,0 +1,432 @@
+version: 5
+environments:
+  default:
+    channels:
+      - url: https://fast.prefix.dev/conda-forge/
+    packages:
+      linux-64:
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h4bc722e_7.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.7.4-hbcca054_0.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_7.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-14.1.0-h77fa898_0.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-14.1.0-h77fa898_0.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-14.1.0-hc0a3c3a_0.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.3.1-h4ab18f5_1.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.1-h4bc722e_2.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.5-h2ad013b_0_cpython.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/ruff-0.5.7-py312hbe4c86d_0.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda
+        - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda
+        - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2
+packages:
+  - kind: conda
+    name: _libgcc_mutex
+    version: '0.1'
+    build: conda_forge
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2
+    sha256: fe51de6107f9edc7aa4f786a70f4a883943bc9d39b3bb7307c04c41410990726
+    md5: d7c89558ba9fa0495403155b64376d81
+    license: None
+    purls: []
+    size: 2562
+    timestamp: 1578324546067
+  - kind: conda
+    name: _openmp_mutex
+    version: '4.5'
+    build: 2_gnu
+    build_number: 16
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2
+    sha256: fbe2c5e56a653bebb982eda4876a9178aedfc2b545f25d0ce9c4c0b508253d22
+    md5: 73aaf86a425cc6e73fcf236a5a46396d
+    depends:
+      - _libgcc_mutex 0.1 conda_forge
+      - libgomp >=7.5.0
+    constrains:
+      - openmp_impl 9999
+    license: BSD-3-Clause
+    license_family: BSD
+    purls: []
+    size: 23621
+    timestamp: 1650670423406
+  - kind: conda
+    name: bzip2
+    version: 1.0.8
+    build: h4bc722e_7
+    build_number: 7
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h4bc722e_7.conda
+    sha256: 5ced96500d945fb286c9c838e54fa759aa04a7129c59800f0846b4335cee770d
+    md5: 62ee74e96c5ebb0af99386de58cf9553
+    depends:
+      - __glibc >=2.17,<3.0.a0
+      - libgcc-ng >=12
+    license: bzip2-1.0.6
+    license_family: BSD
+    purls: []
+    size: 252783
+    timestamp: 1720974456583
+  - kind: conda
+    name: ca-certificates
+    version: 2024.7.4
+    build: hbcca054_0
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.7.4-hbcca054_0.conda
+    sha256: c1548a3235376f464f9931850b64b02492f379b2f2bb98bc786055329b080446
+    md5: 23ab7665c5f63cfb9f1f6195256daac6
+    license: ISC
+    purls: []
+    size: 154853
+    timestamp: 1720077432978
+  - kind: conda
+    name: ld_impl_linux-64
+    version: '2.40'
+    build: hf3520f5_7
+    build_number: 7
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_7.conda
+    sha256: 764b6950aceaaad0c67ef925417594dd14cd2e22fff864aeef455ac259263d15
+    md5: b80f2f396ca2c28b8c14c437a4ed1e74
+    constrains:
+      - binutils_impl_linux-64 2.40
+    license: GPL-3.0-only
+    license_family: GPL
+    purls: []
+    size: 707602
+    timestamp: 1718625640445
+  - kind: conda
+    name: libexpat
+    version: 2.6.2
+    build: h59595ed_0
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda
+    sha256: 331bb7c7c05025343ebd79f86ae612b9e1e74d2687b8f3179faec234f986ce19
+    md5: e7ba12deb7020dd080c6c70e7b6f6a3d
+    depends:
+      - libgcc-ng >=12
+    constrains:
+      - expat 2.6.2.*
+    license: MIT
+    license_family: MIT
+    purls: []
+    size: 73730
+    timestamp: 1710362120304
+  - kind: conda
+    name: libffi
+    version: 3.4.2
+    build: h7f98852_5
+    build_number: 5
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2
+    sha256: ab6e9856c21709b7b517e940ae7028ae0737546122f83c2aa5d692860c3b149e
+    md5: d645c6d2ac96843a2bfaccd2d62b3ac3
+    depends:
+      - libgcc-ng >=9.4.0
+    license: MIT
+    license_family: MIT
+    purls: []
+    size: 58292
+    timestamp: 1636488182923
+  - kind: conda
+    name: libgcc-ng
+    version: 14.1.0
+    build: h77fa898_0
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-14.1.0-h77fa898_0.conda
+    sha256: b8e869ac96591cda2704bf7e77a301025e405227791a0bddf14a3dac65125538
+    md5: ca0fad6a41ddaef54a153b78eccb5037
+    depends:
+      - _libgcc_mutex 0.1 conda_forge
+      - _openmp_mutex >=4.5
+    constrains:
+      - libgomp 14.1.0 h77fa898_0
+    license: GPL-3.0-only WITH GCC-exception-3.1
+    license_family: GPL
+    purls: []
+    size: 842109
+    timestamp: 1719538896937
+  - kind: conda
+    name: libgomp
+    version: 14.1.0
+    build: h77fa898_0
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/libgomp-14.1.0-h77fa898_0.conda
+    sha256: 7699df61a1f6c644b3576a40f54791561f2845983120477a16116b951c9cdb05
+    md5: ae061a5ed5f05818acdf9adab72c146d
+    depends:
+      - _libgcc_mutex 0.1 conda_forge
+    license: GPL-3.0-only WITH GCC-exception-3.1
+    license_family: GPL
+    purls: []
+    size: 456925
+    timestamp: 1719538796073
+  - kind: conda
+    name: libnsl
+    version: 2.0.1
+    build: hd590300_0
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda
+    sha256: 26d77a3bb4dceeedc2a41bd688564fe71bf2d149fdcf117049970bc02ff1add6
+    md5: 30fd6e37fe21f86f4bd26d6ee73eeec7
+    depends:
+      - libgcc-ng >=12
+    license: LGPL-2.1-only
+    license_family: GPL
+    purls: []
+    size: 33408
+    timestamp: 1697359010159
+  - kind: conda
+    name: libsqlite
+    version: 3.46.0
+    build: hde9e2c9_0
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda
+    sha256: daee3f68786231dad457d0dfde3f7f1f9a7f2018adabdbb864226775101341a8
+    md5: 18aa975d2094c34aef978060ae7da7d8
+    depends:
+      - libgcc-ng >=12
+      - libzlib >=1.2.13,<2.0a0
+    license: Unlicense
+    purls: []
+    size: 865346
+    timestamp: 1718050628718
+  - kind: conda
+    name: libstdcxx-ng
+    version: 14.1.0
+    build: hc0a3c3a_0
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-14.1.0-hc0a3c3a_0.conda
+    sha256: 88c42b388202ffe16adaa337e36cf5022c63cf09b0405cf06fc6aeacccbe6146
+    md5: 1cb187a157136398ddbaae90713e2498
+    depends:
+      - libgcc-ng 14.1.0 h77fa898_0
+    license: GPL-3.0-only WITH GCC-exception-3.1
+    license_family: GPL
+    purls: []
+    size: 3881307
+    timestamp: 1719538923443
+  - kind: conda
+    name: libuuid
+    version: 2.38.1
+    build: h0b41bf4_0
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda
+    sha256: 787eb542f055a2b3de553614b25f09eefb0a0931b0c87dbcce6efdfd92f04f18
+    md5: 40b61aab5c7ba9ff276c41cfffe6b80b
+    depends:
+      - libgcc-ng >=12
+    license: BSD-3-Clause
+    license_family: BSD
+    purls: []
+    size: 33601
+    timestamp: 1680112270483
+  - kind: conda
+    name: libxcrypt
+    version: 4.4.36
+    build: hd590300_1
+    build_number: 1
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda
+    sha256: 6ae68e0b86423ef188196fff6207ed0c8195dd84273cb5623b85aa08033a410c
+    md5: 5aa797f8787fe7a17d1b0821485b5adc
+    depends:
+      - libgcc-ng >=12
+    license: LGPL-2.1-or-later
+    purls: []
+    size: 100393
+    timestamp: 1702724383534
+  - kind: conda
+    name: libzlib
+    version: 1.3.1
+    build: h4ab18f5_1
+    build_number: 1
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.3.1-h4ab18f5_1.conda
+    sha256: adf6096f98b537a11ae3729eaa642b0811478f0ea0402ca67b5108fe2cb0010d
+    md5: 57d7dc60e9325e3de37ff8dffd18e814
+    depends:
+      - libgcc-ng >=12
+    constrains:
+      - zlib 1.3.1 *_1
+    license: Zlib
+    license_family: Other
+    purls: []
+    size: 61574
+    timestamp: 1716874187109
+  - kind: conda
+    name: ncurses
+    version: '6.5'
+    build: h59595ed_0
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda
+    sha256: 4fc3b384f4072b68853a0013ea83bdfd3d66b0126e2238e1d6e1560747aa7586
+    md5: fcea371545eda051b6deafb24889fc69
+    depends:
+      - libgcc-ng >=12
+    license: X11 AND BSD-3-Clause
+    purls: []
+    size: 887465
+    timestamp: 1715194722503
+  - kind: conda
+    name: openssl
+    version: 3.3.1
+    build: h4bc722e_2
+    build_number: 2
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.1-h4bc722e_2.conda
+    sha256: b294b3cc706ad1048cdb514f0db3da9f37ae3fcc0c53a7104083dd0918adb200
+    md5: e1b454497f9f7c1147fdde4b53f1b512
+    depends:
+      - __glibc >=2.17,<3.0.a0
+      - ca-certificates
+      - libgcc-ng >=12
+    constrains:
+      - pyopenssl >=22.1
+    license: Apache-2.0
+    license_family: Apache
+    purls: []
+    size: 2895213
+    timestamp: 1721194688955
+  - kind: conda
+    name: python
+    version: 3.12.5
+    build: h2ad013b_0_cpython
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.5-h2ad013b_0_cpython.conda
+    sha256: e2aad83838988725d4ffba4e9717b9328054fd18a668cff3377e0c50f109e8bd
+    md5: 9c56c4df45f6571b13111d8df2448692
+    depends:
+      - __glibc >=2.17,<3.0.a0
+      - bzip2 >=1.0.8,<2.0a0
+      - ld_impl_linux-64 >=2.36.1
+      - libexpat >=2.6.2,<3.0a0
+      - libffi >=3.4,<4.0a0
+      - libgcc-ng >=12
+      - libnsl >=2.0.1,<2.1.0a0
+      - libsqlite >=3.46.0,<4.0a0
+      - libuuid >=2.38.1,<3.0a0
+      - libxcrypt >=4.4.36
+      - libzlib >=1.3.1,<2.0a0
+      - ncurses >=6.5,<7.0a0
+      - openssl >=3.3.1,<4.0a0
+      - readline >=8.2,<9.0a0
+      - tk >=8.6.13,<8.7.0a0
+      - tzdata
+      - xz >=5.2.6,<6.0a0
+    constrains:
+      - python_abi 3.12.* *_cp312
+    license: Python-2.0
+    purls: []
+    size: 31663253
+    timestamp: 1723143721353
+  - kind: conda
+    name: python_abi
+    version: '3.12'
+    build: 4_cp312
+    build_number: 4
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda
+    sha256: 182a329de10a4165f6e8a3804caf751f918f6ea6176dd4e5abcdae1ed3095bf6
+    md5: dccc2d142812964fcc6abdc97b672dff
+    constrains:
+      - python 3.12.* *_cpython
+    license: BSD-3-Clause
+    license_family: BSD
+    purls: []
+    size: 6385
+    timestamp: 1695147396604
+  - kind: conda
+    name: readline
+    version: '8.2'
+    build: h8228510_1
+    build_number: 1
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda
+    sha256: 5435cf39d039387fbdc977b0a762357ea909a7694d9528ab40f005e9208744d7
+    md5: 47d31b792659ce70f470b5c82fdfb7a4
+    depends:
+      - libgcc-ng >=12
+      - ncurses >=6.3,<7.0a0
+    license: GPL-3.0-only
+    license_family: GPL
+    purls: []
+    size: 281456
+    timestamp: 1679532220005
+  - kind: conda
+    name: ruff
+    version: 0.5.7
+    build: py312hbe4c86d_0
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/ruff-0.5.7-py312hbe4c86d_0.conda
+    sha256: b8cc83042471c5740f29a5f3ce1ef7116b892095591907929671fe4e33345026
+    md5: 8871e1b8e5ec1c57d3769adc0b9e5d68
+    depends:
+      - __glibc >=2.17,<3.0.a0
+      - libgcc-ng >=12
+      - libstdcxx-ng >=12
+      - python >=3.12,<3.13.0a0
+      - python_abi 3.12.* *_cp312
+    constrains:
+      - __glibc >=2.17
+    license: MIT
+    license_family: MIT
+    purls:
+      - pkg:pypi/ruff?source=hash-mapping
+    size: 7184746
+    timestamp: 1723150552013
+  - kind: conda
+    name: tk
+    version: 8.6.13
+    build: noxft_h4845f30_101
+    build_number: 101
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda
+    sha256: e0569c9caa68bf476bead1bed3d79650bb080b532c64a4af7d8ca286c08dea4e
+    md5: d453b98d9c83e71da0741bb0ff4d76bc
+    depends:
+      - libgcc-ng >=12
+      - libzlib >=1.2.13,<2.0.0a0
+    license: TCL
+    license_family: BSD
+    purls: []
+    size: 3318875
+    timestamp: 1699202167581
+  - kind: conda
+    name: tzdata
+    version: 2024a
+    build: h0c530f3_0
+    subdir: noarch
+    noarch: generic
+    url: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda
+    sha256: 7b2b69c54ec62a243eb6fba2391b5e443421608c3ae5dbff938ad33ca8db5122
+    md5: 161081fc7cec0bfda0d86d7cb595f8d8
+    license: LicenseRef-Public-Domain
+    purls: []
+    size: 119815
+    timestamp: 1706886945727
+  - kind: conda
+    name: xz
+    version: 5.2.6
+    build: h166bdaf_0
+    subdir: linux-64
+    url: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2
+    sha256: 03a6d28ded42af8a347345f82f3eebdd6807a08526d47899a42d62d319609162
+    md5: 2161070d867d1b1204ea749c8eec4ef0
+    depends:
+      - libgcc-ng >=12
+    license: LGPL-2.1 and GPL-2.0
+    purls: []
+    size: 418368
+    timestamp: 1660346797927
diff --git a/tests/satisfiability/pypi-deps-not-in-lock/pixi.toml b/tests/satisfiability/pypi-deps-not-in-lock/pixi.toml
new file mode 100644
index 000000000..10ae4b6fb
--- /dev/null
+++ b/tests/satisfiability/pypi-deps-not-in-lock/pixi.toml
@@ -0,0 +1,8 @@
+[project]
+channels = ["https://fast.prefix.dev/conda-forge"]
+name = "ruff"
+platforms = ["linux-64"]
+[dependencies]
+ruff = "*"
+[pypi-dependencies]
+ruff = "*"