Skip to content

Commit

Permalink
Merge branch 'main' into set-version
Browse files Browse the repository at this point in the history
  • Loading branch information
trallard authored Nov 18, 2024
2 parents a0e87f9 + 6be6ab5 commit cf5225a
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 8 deletions.
48 changes: 48 additions & 0 deletions .github/workflows/build_pypi_package.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: "Build PyPI package"

on:
pull_request:
paths:
- ".github/workflows/**"
- "conda-store/**"
- "conda-store-server/**"
- "tests/**"
push:
branches:
- main

env:
FORCE_COLOR: "1" # Make tools pretty.

permissions:
contents: read # This is required for actions/checkout

jobs:
# Always build & verify package.
build-package:
name: "Build & verify package"
runs-on: ubuntu-latest
strategy:
matrix:
directory:
- "conda-store"
- "conda-store-server"
defaults:
run:
working-directory: ${{ matrix.directory }}
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 }} 📦"
uses: hynek/build-and-inspect-python-package@v2
id: baipp
with:
path: ${{ matrix.directory }}
upload-name-suffix: "-${{ matrix.directory }}"

- run: echo Packages can be found at ${{ steps.baipp.outputs.dist }} and in artifact ${{ steps.baipp.outputs.artifact-name }}
6 changes: 1 addition & 5 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
name: "Build and maybe upload PyPI package"
name: "Build and upload PyPI package"

on:
release:
types: [published]
push:
branches: [main]
tags: ["*"]
pull_request:
branches:
- main
workflow_dispatch:

env:
Expand Down
2 changes: 1 addition & 1 deletion conda-store-server/conda_store_server/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from .app import CondaStore


__version__ = "2024.11.1"
__version__ = "2024.11.2-dev"


CONDA_STORE_DIR = platformdirs.user_data_path(appname="conda-store")
Expand Down
2 changes: 1 addition & 1 deletion conda-store/conda_store/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.

__version__ = "2024.11.1"
__version__ = "2024.11.2-dev"
2 changes: 1 addition & 1 deletion docusaurus-docs/static/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@
},
"info": {
"title": "conda-store",
"version": "2024.11.1"
"version": "2024.11.2-dev"
},
"openapi": "3.1.0",
"paths": {
Expand Down

0 comments on commit cf5225a

Please sign in to comment.