Skip to content

Commit 5a0c480

Browse files
authored
Merge pull request #325 from JohT/feature/support-conda-package-files-and-mac
Support conda package files and Python 3.12 on MacOs
2 parents b13ff54 + 19ebd41 commit 5a0c480

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

.github/workflows/public-analyze-code-graph.yml

+6-13
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,6 @@ jobs:
9696
java-version: ${{ matrix.java }}
9797

9898
# "Setup Python" can be skipped if jupyter notebook analysis-results aren't needed
99-
- name: (Python Setup) Setup Cache for Conda package manager Miniforge
100-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
101-
env:
102-
# Increase this value to reset cache if etc/example-environment.yml has not changed
103-
# Reference: https://github.com/conda-incubator/setup-miniconda#caching
104-
CACHE_NUMBER: 0
105-
with:
106-
path: ~/conda_pkgs_dir
107-
key:
108-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-environments-${{hashFiles('**/environment.yml', '.github/workflows/*.yml') }}
109-
11099
- name: (Python Setup) Use version ${{ matrix.python }} with Conda package manager Miniforge
111100
uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3
112101
with:
@@ -115,10 +104,14 @@ jobs:
115104
activate-environment: codegraph
116105
environment-file: ./jupyter/environment.yml
117106
auto-activate-base: false
118-
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
107+
show-channel-urls: true
119108
- name: (Python Setup) Conda environment info
120109
shell: bash -el {0}
121-
run: conda info
110+
run: |
111+
conda info
112+
conda list
113+
conda config --show-sources
114+
conda config --show
122115
123116
- name: (Code Analysis Setup) Setup Cache Analysis Downloads
124117
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4

jupyter/environment.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
name: codegraph
22
channels:
3+
- conda-forge/label/python_rc # Needed on Mac since Python >= 3.12
34
- conda-forge
45
dependencies:
56
- python=3.12.*
7+
- _python_rc=* # Needed on Mac since Python >= 3.12
68
- jupyter=1.1.*
79
- matplotlib=3.10.*
8-
- nbconvert=7.2.*
9-
- nbconvert-webpdf=7.2.*
10+
- nbconvert=7.16.*
11+
- nbconvert-webpdf=7.16.*
1012
- numpy=1.26.*
1113
- pandas=2.2.*
1214
- pip=25.0.*

0 commit comments

Comments
 (0)