Merge branch 'main' into python3.12

# Conflicts: # poetry.lock
AnatomicMaps · May 20, 2024 · 7ac0fea · 7ac0fea
2 parents 69d595a + 95f8dc4
commit 7ac0fea
Show file tree

Hide file tree

Showing 3 changed files with 134 additions and 133 deletions.
diff --git a/envs/mapmaker.yaml b/envs/mapmaker.yaml
@@ -15,8 +15,8 @@ dependencies:
   - pyproj>=3.4.0,<4.0.0
   - mercantile>=1.2.1,<2.0.0
   - mbutil>=0.3.0,<0.4.0
-  - networkx>=2.8.8,<3.0.0
-  - openpyxl==3.1.0
+  - networkx>=3.3.0
+  - openpyxl>=3.1.0
   - tqdm>=4.64.0,<5.0.0
   - lxml>=5.2.2,<6.0.0
   - svglib>=1.3.0,<2.0.0
@@ -36,7 +36,7 @@ dependencies:
   - conda-forge::coincbc
   - pip
   - pip:
-      - https://github.com/AnatomicMaps/flatmap-knowledge/releases/download/v1.7.0/flatmapknowledge-1.7.0-py3-none-any.whl
+      - https://github.com/AnatomicMaps/flatmap-knowledge/releases/download/v1.7.1/flatmapknowledge-1.7.1-py3-none-any.whl
       - opencv-python-headless>=4.6.0.66,<4.7.0.0
       - skia-python==124.0b7
       - cssselect2>=0.6.0,<0.7.0