Skip to content

Commit c6fae44

Browse files
zjpzjp
committed
ci: Remove the wheels
1 parent 377e8f5 commit c6fae44

14 files changed

Lines changed: 6 additions & 415 deletions

‎.github/workflows/check-for-changes.yml‎

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ jobs:
3838
run: make prepare-coverage
3939
- name: Check whether ChimeraX.exe and python -m chimerax.core are equivalent
4040
run: USE_COVERAGE=1 make pytest-both-exes
41-
- name: Run wheel tests
42-
run: USE_COVERAGE=1 make pytest-wheel
4341
- name: Run distribution tests
4442
run: USE_COVERAGE=1 make pytest-app
4543
- name: Report coverage
@@ -104,8 +102,6 @@ jobs:
104102
run: make prepare-coverage
105103
- name: Check whether ChimeraX.exe and python -m chimerax.core are equivalent
106104
run: USE_COVERAGE=1 make pytest-both-exes
107-
- name: Run wheel tests
108-
run: USE_COVERAGE=1 make pytest-wheel
109105
- name: Run distribution tests
110106
run: USE_COVERAGE=1 make pytest-app
111107
- name: Report coverage
@@ -135,64 +131,7 @@ jobs:
135131
run: make prepare-coverage
136132
- name: Check whether ChimeraX.exe and python -m chimerax.core are equivalent
137133
run: USE_COVERAGE=1 make pytest-both-exes
138-
- name: Run wheel tests
139-
run: USE_COVERAGE=1 make pytest-wheel
140134
- name: Run distribution tests
141135
run: USE_COVERAGE=1 make pytest-app
142136
- name: Report coverage
143137
run: make report-coverage
144-
build-and-test-wheels:
145-
runs-on: macos-latest
146-
steps:
147-
- uses: actions/checkout@v6
148-
- name: Set up Homebrew
149-
id: set-up-homebrew
150-
uses: Homebrew/actions/setup-homebrew@master
151-
- run: ${PWD}/utils/set_up_macos.sh
152-
- name: Fetch Plato prerequisites
153-
uses: ./utils/ci/consolidated_cache
154-
with:
155-
platform: macos
156-
architecture: arm64
157-
cache_key: ${{ secrets.PREBUILT_CACHE_SECRET }}
158-
- name: Install the 3DConnexion Framework
159-
run: |
160-
hdiutil attach 3DxWareMac_v10-8-7_r3836.dmg -nobrowse -noverify
161-
sudo installer -pkg /Volumes/3Dconnexion\ Software/Install\ 3Dconnexion\ software.pkg -target /
162-
hdiutil detach /Volumes/3Dconnexion\ Software
163-
- name: Set up uv
164-
run: |
165-
curl -LsSf https://astral.sh/uv/install.sh | sh
166-
uv venv -p 3.11.4
167-
source .venv/bin/activate
168-
- run: source .venv/bin/activate && MAKEOPTS="-j$(sysctl -n hw.logicalcpu)" BUILD_TYPE="${{ inputs.release_type }}" make -j$(sysctl -n hw.logicalcpu) uv-install
169-
- name: Copy the ChimeraX directory out of the virtual environment
170-
run: |
171-
mkdir -p build/wheel/
172-
mv .venv/lib/python3.11/site-packages/chimerax build/wheel
173-
rm -rf .venv/lib/python3.11/site-packages/chimerax*
174-
- name: Copy the wheel build files to build/wheel
175-
run: |
176-
cp pyproject.toml build/wheel
177-
cp utils/build/wheel/make_init.py build/wheel
178-
cp utils/build/wheel/setup.py build/wheel
179-
cp utils/build/wheel/filter_modules.py build/wheel
180-
cp utils/build/wheel/make_init.py build/wheel
181-
- name: Remove UI files and add an __init__.py
182-
run: |
183-
source .venv/bin/activate
184-
cd build/wheel
185-
python filter_modules.py
186-
python make_init.py
187-
# TODO: filter_deps.py
188-
uv build --wheel
189-
- name: Reinstall the wheel we just made
190-
continue-on-error: true
191-
run: |
192-
source .venv/bin/activate
193-
uv pip install build/wheel/dist/*.whl
194-
- name: Test the wheel again
195-
continue-on-error: true
196-
run: |
197-
source .venv/bin/activate
198-
UV_BUILD=1 USE_COVERAGE=1 make pytest-wheel

‎.github/workflows/mac_arm_build.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ jobs:
8181
continue-on-error: true
8282
id: test-exes
8383
run: USE_COVERAGE=1 make pytest-both-exes
84-
- name: Run wheel tests
85-
continue-on-error: true
86-
id: test-wheel
87-
run: USE_COVERAGE=1 make pytest-wheel
8884
- name: Run distribution tests
8985
continue-on-error: true
9086
id: test-distribution
@@ -94,7 +90,7 @@ jobs:
9490

9591
- name: Put the test outcome in the environment
9692
run: |
97-
if [ "${{ steps.test-exes.outcome }}" = "failure" ] || [ "${{ steps.test-wheel.outcome }}" = "failure" ] || [ "${{ steps.test-distribution.outcome }}" = "failure" ]; then
93+
if [ "${{ steps.test-exes.outcome }}" = "failure" ] || [ "${{ steps.test-distribution.outcome }}" = "failure" ]; then
9894
echo "TEST_OUTCOME=Failing" >> $GITHUB_ENV
9995
else
10096
echo "TEST_OUTCOME=Passing" >> $GITHUB_ENV

‎.github/workflows/mac_intel_build.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,6 @@ jobs:
8484
continue-on-error: true
8585
id: test-exes
8686
run: USE_COVERAGE=1 make pytest-both-exes
87-
- name: Run wheel tests
88-
continue-on-error: true
89-
id: test-wheel
90-
run: USE_COVERAGE=1 make pytest-wheel
9187
- name: Run distribution tests
9288
continue-on-error: true
9389
id: test-distribution
@@ -97,7 +93,7 @@ jobs:
9793

9894
- name: Put the test outcome in the environment
9995
run: |
100-
if [ "${{ steps.test-exes.outcome }}" = "failure" ] || [ "${{ steps.test-wheel.outcome }}" = "failure" ] || [ "${{ steps.test-distribution.outcome }}" = "failure" ]; then
96+
if [ "${{ steps.test-exes.outcome }}" = "failure" ] || [ "${{ steps.test-distribution.outcome }}" = "failure" ]; then
10197
echo "TEST_OUTCOME=Failing" >> $GITHUB_ENV
10298
else
10399
echo "TEST_OUTCOME=Passing" >> $GITHUB_ENV

‎.github/workflows/on-push.yml‎

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ jobs:
3434
run: make prepare-coverage
3535
- name: Check whether ChimeraX.exe and python -m chimerax.core are equivalent
3636
run: USE_COVERAGE=1 make pytest-both-exes
37-
- name: Run wheel tests
38-
run: USE_COVERAGE=1 make pytest-wheel
3937
- name: Run distribution tests
4038
run: USE_COVERAGE=1 make pytest-app
4139
- name: Report coverage
@@ -100,8 +98,6 @@ jobs:
10098
run: make prepare-coverage
10199
- name: Check whether ChimeraX.exe and python -m chimerax.core are equivalent
102100
run: USE_COVERAGE=1 make pytest-both-exes
103-
- name: Run wheel tests
104-
run: USE_COVERAGE=1 make pytest-wheel
105101
- name: Run distribution tests
106102
run: USE_COVERAGE=1 make pytest-app
107103
- name: Report coverage
@@ -131,64 +127,7 @@ jobs:
131127
run: make prepare-coverage
132128
- name: Check whether ChimeraX.exe and python -m chimerax.core are equivalent
133129
run: USE_COVERAGE=1 make pytest-both-exes
134-
- name: Run wheel tests
135-
run: USE_COVERAGE=1 make pytest-wheel
136130
- name: Run distribution tests
137131
run: USE_COVERAGE=1 make pytest-app
138132
- name: Report coverage
139133
run: make report-coverage
140-
build-and-test-wheels:
141-
runs-on: macos-latest
142-
steps:
143-
- uses: actions/checkout@v6
144-
- name: Set up Homebrew
145-
id: set-up-homebrew
146-
uses: Homebrew/actions/setup-homebrew@master
147-
- run: ${PWD}/utils/set_up_macos.sh
148-
- name: Fetch Plato prerequisites
149-
uses: ./utils/ci/consolidated_cache
150-
with:
151-
platform: macos
152-
architecture: arm64
153-
cache_key: ${{ secrets.PREBUILT_CACHE_SECRET }}
154-
- name: Install the 3DConnexion Framework
155-
run: |
156-
hdiutil attach 3DxWareMac_v10-8-7_r3836.dmg -nobrowse -noverify
157-
sudo installer -pkg /Volumes/3Dconnexion\ Software/Install\ 3Dconnexion\ software.pkg -target /
158-
hdiutil detach /Volumes/3Dconnexion\ Software
159-
- name: Set up uv
160-
run: |
161-
curl -LsSf https://astral.sh/uv/install.sh | sh
162-
uv venv -p 3.11.4
163-
source .venv/bin/activate
164-
- run: source .venv/bin/activate && MAKEOPTS="-j$(sysctl -n hw.logicalcpu)" BUILD_TYPE="${{ inputs.release_type }}" make -j$(sysctl -n hw.logicalcpu) uv-install
165-
- name: Copy the ChimeraX directory out of the virtual environment
166-
run: |
167-
mkdir -p build/wheel/
168-
mv .venv/lib/python3.11/site-packages/chimerax build/wheel
169-
rm -rf .venv/lib/python3.11/site-packages/chimerax*
170-
- name: Copy the wheel build files to build/wheel
171-
run: |
172-
cp pyproject.toml build/wheel
173-
cp utils/build/wheel/make_init.py build/wheel
174-
cp utils/build/wheel/setup.py build/wheel
175-
cp utils/build/wheel/filter_modules.py build/wheel
176-
cp utils/build/wheel/make_init.py build/wheel
177-
- name: Remove UI files and add an __init__.py
178-
run: |
179-
source .venv/bin/activate
180-
cd build/wheel
181-
python filter_modules.py
182-
python make_init.py
183-
# TODO: filter_deps.py
184-
uv build --wheel
185-
- name: Reinstall the wheel we just made
186-
continue-on-error: true
187-
run: |
188-
source .venv/bin/activate
189-
uv pip install build/wheel/dist/*.whl
190-
- name: Test the wheel again
191-
continue-on-error: true
192-
run: |
193-
source .venv/bin/activate
194-
UV_BUILD=1 USE_COVERAGE=1 make pytest-wheel

‎.github/workflows/release.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,3 @@ jobs:
7070
branch: master
7171
release_type: production
7272
secrets: inherit
73-
# build-wheels:
74-
# name: Build ChimeraX wheels
75-
# uses: ./.github/workflows/wheels.yml
76-
# with:
77-
# branch: develop
78-
# release_type: production
79-
# secrets: inherit

‎.github/workflows/rocky10_build.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ jobs:
8383
continue-on-error: true
8484
id: test-exes
8585
run: USE_COVERAGE=1 make pytest-both-exes
86-
- name: Run wheel tests
87-
continue-on-error: true
88-
id: test-wheel
89-
run: USE_COVERAGE=1 make pytest-wheel
9086
- name: Run distribution tests
9187
continue-on-error: true
9288
id: test-distribution
@@ -95,7 +91,7 @@ jobs:
9591
run: make report-coverage
9692
- name: Put the test outcome in the environment
9793
run: |
98-
if [ "${{ steps.test-exes.outcome }}" = "failure" ] || [ "${{ steps.test-wheel.outcome }}" = "failure" ] || [ "${{ steps.test-distribution.outcome }}" = "failure" ]; then
94+
if [ "${{ steps.test-exes.outcome }}" = "failure" ] || [ "${{ steps.test-distribution.outcome }}" = "failure" ]; then
9995
echo "TEST_OUTCOME=Failing" >> $GITHUB_ENV
10096
else
10197
echo "TEST_OUTCOME=Passing" >> $GITHUB_ENV

‎.github/workflows/rocky9_build.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ jobs:
6262
continue-on-error: true
6363
id: test-exes
6464
run: USE_COVERAGE=1 make pytest-both-exes
65-
- name: Run wheel tests
66-
id: test-wheel
67-
continue-on-error: true
68-
run: USE_COVERAGE=1 make pytest-wheel
6965
- name: Run distribution tests
7066
id: test-distribution
7167
continue-on-error: true
@@ -74,7 +70,7 @@ jobs:
7470
run: make report-coverage
7571
- name: Put the test outcome in the environment
7672
run: |
77-
if [ "${{ steps.test-exes.outcome }}" = "failure" ] || [ "${{ steps.test-wheel.outcome }}" = "failure" ] || [ "${{ steps.test-distribution.outcome }}" = "failure" ]; then
73+
if [ "${{ steps.test-exes.outcome }}" = "failure" ] || [ "${{ steps.test-distribution.outcome }}" = "failure" ]; then
7874
echo "TEST_OUTCOME=Failing" >> $GITHUB_ENV
7975
else
8076
echo "TEST_OUTCOME=Passing" >> $GITHUB_ENV

‎.github/workflows/wheels.yml‎

Lines changed: 0 additions & 118 deletions
This file was deleted.

0 commit comments

Comments
 (0)