Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't build conda store cli #1019

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions .github/workflows/build_docker_image.yaml
Original file line number Diff line number Diff line change
@@ -18,9 +18,6 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
docker-image:
- conda-store
- conda-store-server
platform:
- linux/amd64
- linux/arm64
@@ -66,24 +63,24 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
quansight/${{ matrix.docker-image }}
quay.io/quansight/${{ matrix.docker-image }}
quansight/conda-store-server
quay.io/quansight/conda-store-server
tags: |
type=ref,event=tag
type=sha

# we need this as we are setting the context to subproject directory
- name: "Copy .dockerignore"
run: |
cp .dockerignore ${{ matrix.docker-image }}/.dockerignore
cp .dockerignore conda-store-server/.dockerignore
shell: bash

- name: "Publish Docker image 🚀"
uses: docker/build-push-action@v5
with:
context: "${{ matrix.docker-image }}"
context: "conda-store-server"
target: "dev"
file: "${{ matrix.docker-image }}/Dockerfile"
file: "conda-store-server/Dockerfile"
tags: |
${{ steps.meta.outputs.tags }}
push: true
16 changes: 4 additions & 12 deletions .github/workflows/build_pypi_package.yaml
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ on:
pull_request:
paths:
- ".github/workflows/**"
- "conda-store/**"
- "conda-store-server/**"
- "tests/**"
push:
@@ -22,27 +21,20 @@ jobs:
build-package:
name: "Build & verify package"
runs-on: ubuntu-latest
strategy:
matrix:
directory:
- "conda-store"
- "conda-store-server"
defaults:
run:
working-directory: ${{ matrix.directory }}
working-directory: conda-store-server
steps:
- name: "Checkout Repository 🛎"
uses: actions/checkout@v4
with:
fetch-depth: 0

- run: echo "Running on ${{ matrix.directory }}"

- name: "Build and check package - ${{ matrix.directory }} 📦"
- name: "Build and check package 📦"
uses: hynek/build-and-inspect-python-package@v2
id: baipp
with:
path: ${{ matrix.directory }}
upload-name-suffix: "-${{ matrix.directory }}"
path: conda-store-server
upload-name-suffix: "-conda-store-server"

- run: echo Packages can be found at ${{ steps.baipp.outputs.dist }} and in artifact ${{ steps.baipp.outputs.artifact-name }}
46 changes: 12 additions & 34 deletions .github/workflows/release.yaml
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a lot of places where we use conda-store-server, which might change as we consolidate the packages. I suggest setting a job-level env variable for this and reusing the variable instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the amount of effort it will take to introduce a job-level variable will be pretty similar to the amount of effort it will take to explicitly rename things. Since (1) we should only be renaming conda-store-server -> conda-store once, and (2) it is easier to read + debug yaml files (and ci) that use explicit names opposed to variables, I would prefer not to introduce this variable.

But open to doing it if I'm missing an important upside that it will provide. I think it would be appropriate to do that work in a follow up PR

Original file line number Diff line number Diff line change
@@ -20,28 +20,22 @@ jobs:
build-package:
name: "Build & verify package"
runs-on: ubuntu-latest
strategy:
matrix:
directory:
- "conda-store"
- "conda-store-server"
defaults:
run:
working-directory: ${{ matrix.directory }}
working-directory: conda-store-server
steps:
- name: "Checkout Repository 🛎"
uses: actions/checkout@v4
with:
fetch-depth: 0

- run: echo "Running on ${{ matrix.directory }}"

- name: "Build and check package - ${{ matrix.directory }} 📦"
- name: "Build and check package 📦"
uses: hynek/build-and-inspect-python-package@v2
id: baipp
with:
path: ${{ matrix.directory }}
upload-name-suffix: "-${{ matrix.directory }}"
path: conda-store-server
upload-name-suffix: "-conda-store-server"
attest-build-provenance-github: "true"

- run: echo Packages can be found at ${{ steps.baipp.outputs.dist }} and in artifact ${{ steps.baipp.outputs.artifact-name }}
@@ -55,17 +49,11 @@ jobs:
if: github.repository_owner == 'conda-incubator' && github.event_name == 'push' && github.ref == 'refs/heads/main'
permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
strategy:
matrix:
directory:
- "conda-store"
- "conda-store-server"

steps:
- name: "Download build artefacts 📥"
uses: actions/download-artifact@v4.1.7
with:
name: Packages-${{ matrix.directory }}
name: Packages-conda-store-server
path: dist

- run: ls -lR dist/
@@ -86,20 +74,15 @@ jobs:
needs: build-package
permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
strategy:
matrix:
directory:
- "conda-store"
- "conda-store-server"
defaults:
run:
working-directory: ${{ matrix.directory }}
working-directory: conda-store-server

steps:
- name: "Download build artefacts 📥"
uses: actions/download-artifact@v4.1.7
with:
name: Packages-${{ matrix.directory }}
name: Packages-conda-store-server
path: dist

- name: "Upload to PyPI 🚀"
@@ -114,11 +97,6 @@ jobs:
needs: release-pypi
permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
strategy:
matrix:
docker-image:
- conda-store
- conda-store-server
steps:
- name: "Checkout Repository 🛎"
uses: actions/checkout@v4
@@ -129,7 +107,7 @@ jobs:

- name: "Copy .dockerignore"
run: |
cp .dockerignore ${{ matrix.docker-image }}/.dockerignore
cp .dockerignore conda-store-server/.dockerignore
shell: bash

- name: "Retrieve secret from Vault 🗝"
@@ -166,8 +144,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
quansight/${{ matrix.docker-image }}
quay.io/quansight/${{ matrix.docker-image }}
quansight/conda-store-server
quay.io/quansight/conda-store-server
tags: |
type=ref,event=tag
type=ref,event=branch
@@ -176,9 +154,9 @@ jobs:
- name: "Publish Docker image 🚀"
uses: docker/build-push-action@v5
with:
context: "${{ matrix.docker-image }}"
context: "conda-store-server"
target: "prod"
file: "${{ matrix.docker-image }}/Dockerfile"
file: "conda-store-server/Dockerfile"
build-args: |
RELEASE_VERSION=${{github.ref_name}}
python_version=${{ env.PYTHON_VERSION_DEFAULT }}
14 changes: 5 additions & 9 deletions .github/workflows/test_build_docker_image.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@ on:
paths:
- ".github/workflows/**"
- ".github/actions/**"
- "conda-store/**"
- "conda-store-server/**"
- "examples/**"
- "tests/**"
@@ -29,9 +28,6 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
docker-image:
- conda-store
- conda-store-server
platform:
- linux/amd64
- linux/arm64
@@ -49,29 +45,29 @@ jobs:
- name: "Lint Dockerfiles 🔍"
uses: jbergstroem/hadolint-gh-action@v1
with:
dockerfile: ${{ matrix.docker-image }}/Dockerfile
dockerfile: conda-store-server/Dockerfile
output_format: tty
error_level: 0

- name: "Copy .dockerignore"
run: |
cp .dockerignore ${{ matrix.docker-image }}/.dockerignore
cp .dockerignore conda-store-server/.dockerignore
shell: bash

- name: "Add Docker metadata 📝"
id: meta
uses: docker/metadata-action@v5
with:
images: |
quansight/${{ matrix.docker-image }}
quansight/conda-store-server
tags: |
type=sha

- name: "Build Docker images 🐳"
uses: docker/build-push-action@v5
with:
context: "${{ matrix.docker-image }}"
file: "${{ matrix.docker-image }}/Dockerfile"
context: "conda-store-server"
file: "conda-store-server/Dockerfile"
tags: |
${{ steps.meta.outputs.tags }}
target: "dev"
86 changes: 0 additions & 86 deletions .github/workflows/test_conda_store.yaml

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/test_conda_store_server_integration.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@ on:
paths:
- ".github/workflows/**"
- ".github/actions/**"
- "conda-store/**"
- "conda-store-server/**"
- "examples/**"
- "tests/**"
1 change: 0 additions & 1 deletion .github/workflows/test_conda_store_server_unit.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@ on:
paths:
- ".github/workflows/**"
- ".github/actions/**"
- "conda-store/**"
- "conda-store-server/**"
- "examples/**"
- "tests/**"
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -14,8 +14,11 @@ Flexible. Reproducible. Governable.
| :---------- | :-----|
| Project | [![License](https://img.shields.io/badge/License-BSD%203--Clause-gray.svg?colorA=2b2d42&colorB=206532&style=flat.svg)](https://opensource.org/licenses/BSD-3-Clause) [![Read the docs](https://img.shields.io/badge/%F0%9F%93%96%20Read-the%20docs-gray.svg?colorA=2b2d42&colorB=206532&style=flat.svg)](https://conda.store)|
|Community | [![Open an issue](https://img.shields.io/badge/%F0%9F%93%9D%20Open-an%20issue-gray.svg?colorA=2b2d42&colorB=206532&style=flat.svg)](https://github.com/conda-incubator/conda-store/issues/new/choose) [![Community guidelines](https://img.shields.io/badge/🤝%20Community-guidelines-gray.svg?colorA=2b2d42&colorB=206532&style=flat.svg)](https://conda.store/community/introduction)|
|Releases | [![PyPI release conda-store](https://img.shields.io/pypi/v/conda-store)](https://badge.fury.io/py/conda-store?label=pypi%20conda-store&style=flat.svg) [![PyPI release conda-store-server](https://img.shields.io/pypi/v/conda-store-server?label=pypi%20conda-store-server)](https://badge.fury.io/py/conda-store-server) [![conda-forge release conda-store](https://img.shields.io/conda/vn/conda-forge/conda-store?label=conda-forge%20conda-store)]((https://anaconda.org/conda-forge/conda-store)) [![conda-forge release conda-store-server](https://img.shields.io/conda/vn/conda-forge/conda-store-server?label=conda-forge%20conda-store-server)]((https://anaconda.org/conda-forge/conda-store-server)) |
|Releases | [![PyPI release conda-store-server](https://img.shields.io/pypi/v/conda-store-server?label=pypi%20conda-store-server)](https://badge.fury.io/py/conda-store-server) [![conda-forge release conda-store-server](https://img.shields.io/conda/vn/conda-forge/conda-store-server?label=conda-forge%20conda-store-server)]((https://anaconda.org/conda-forge/conda-store-server)) |

> [!CAUTION]
> conda-store (client) will no longer be recieving updates!
> The last release is [2024.11.2](https://pypi.org/project/conda-store/2024.11.2/)
---

conda-store provides the familiarity and flexibility of conda environments, without compromising reliability for
4 changes: 3 additions & 1 deletion conda-store/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# conda-store

Check the full documentation at [conda.store](https://conda.store/).
> [!CAUTION]
> conda-store (client) will no longer be recieving updates!
> The last release is [2024.11.2](https://pypi.org/project/conda-store/2024.11.2/)

A client library which provides a CLI for interacting with conda-store-server.

2 changes: 1 addition & 1 deletion docusaurus-docs/community/contribute/contribute-code.md
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ The issues marked with the "good first issue" label are a great place to start.

conda-store development happens across three repositories, and the relevant programming language and technologies are listed below:

* `conda-store` and `conda-store-server`: Python, FastAPI, and conda ecosystem
* `conda-store-server`: Python, FastAPI, and conda ecosystem
* `conda-store-ui`: Typescript, React, and frontend web development
* `jupyterlab-conda-store`: JupyterLab extension development (Typescript and Javascript)

Loading
Loading