Skip to content

Commit ca8f5a0

Browse files
committed
Stop building our own conda package in favour of conda-forge
1 parent e4465bc commit ca8f5a0

7 files changed

Lines changed: 13 additions & 164 deletions

File tree

.bumpversion.cfg

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,3 @@ replace = : str = "{new_version}"
1717
[bumpversion:file:pyproject.toml]
1818
search = version = "{current_version}"
1919
replace = version = "{new_version}"
20-
21-
[bumpversion:file:.github/workflows/conda_ci.yml]
22-
search = ={current_version}=py_1
23-
replace = ={new_version}=py_1

.github/workflows/conda_ci.yml

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

.github/workflows/python_ci_linux.yml

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -178,68 +178,3 @@ jobs:
178178
python .github/milestones.py
179179
env:
180180
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
181-
182-
183-
184-
Conda:
185-
needs: deploy
186-
permissions:
187-
contents: read
188-
runs-on: ubuntu-22.04
189-
if: startsWith(github.ref, 'refs/tags/') || (startsWith(github.event.head_commit.message, 'Bump version') != true)
190-
steps:
191-
- name: Checkout 🛎️
192-
uses: "actions/checkout@v4"
193-
194-
- name: Setup Python 🐍
195-
uses: "actions/setup-python@v5"
196-
with:
197-
python-version: 3.11
198-
199-
- name: Setup Conda
200-
uses: conda-incubator/setup-miniconda@v2.1.1
201-
with:
202-
activate-environment: env
203-
conda-build-version: 3.28.4
204-
miniconda-version: py311_24.1.2-0
205-
python-version: "3.11"
206-
miniforge-variant: Mambaforge
207-
208-
- name: Install dependencies 🔧
209-
run: |
210-
python -VV
211-
python -m site
212-
python -m pip install --upgrade pip setuptools wheel
213-
python -m pip install --upgrade "mkrecipe" "whey"
214-
# $CONDA is an environment variable pointing to the root of the miniconda directory
215-
$CONDA/bin/conda config --set always_yes yes --set changeps1 no
216-
$CONDA/bin/conda update -n base conda
217-
$CONDA/bin/conda info -a
218-
$CONDA/bin/conda install conda-forge::py-lief=0.14.1
219-
$CONDA/bin/conda config --add channels conda-forge
220-
$CONDA/bin/conda config --add channels domdfcoding
221-
222-
$CONDA/bin/conda config --remove channels defaults
223-
224-
- name: Build Conda Package 📦
225-
run: |
226-
python -m mkrecipe --type wheel || exit 1
227-
$CONDA/bin/conda build conda -c conda-forge -c domdfcoding --output-folder conda/dist
228-
229-
- name: Deploy Conda Package 🚀
230-
if: startsWith(github.ref, 'refs/tags/')
231-
run: |
232-
$CONDA/bin/conda config --set always_yes yes --set changeps1 no
233-
$CONDA/bin/conda install anaconda-client
234-
$CONDA/bin/conda info -a
235-
236-
for f in conda/dist/noarch/dict2css-*.tar.bz2; do
237-
[ -e "$f" ] || continue
238-
echo "$f"
239-
conda install "$f" || exit 1
240-
echo "Deploying to Anaconda.org..."
241-
$CONDA/bin/anaconda -t "$ANACONDA_TOKEN" upload "$f" || exit 1
242-
echo "Successfully deployed to Anaconda.org."
243-
done
244-
env:
245-
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}

README.rst

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ dict2css
8686
:target: https://pypi.org/project/dict2css/
8787
:alt: PyPI - Wheel
8888

89-
.. |conda-version| image:: https://img.shields.io/conda/v/domdfcoding/dict2css?logo=anaconda
90-
:target: https://anaconda.org/domdfcoding/dict2css
89+
.. |conda-version| image:: https://img.shields.io/conda/v/conda-forge/dict2css?logo=anaconda
90+
:target: https://anaconda.org/conda-forge/dict2css
9191
:alt: Conda - Package Version
9292

93-
.. |conda-platform| image:: https://img.shields.io/conda/pn/domdfcoding/dict2css?label=conda%7Cplatform
94-
:target: https://anaconda.org/domdfcoding/dict2css
93+
.. |conda-platform| image:: https://img.shields.io/conda/pn/conda-forge/dict2css?label=conda%7Cplatform
94+
:target: https://anaconda.org/conda-forge/dict2css
9595
:alt: Conda - Platform
9696

9797
.. |license| image:: https://img.shields.io/github/license/sphinx-toolbox/dict2css
@@ -147,17 +147,8 @@ To install with ``pip``:
147147
148148
To install with ``conda``:
149149

150-
* First add the required channels
151-
152-
.. code-block:: bash
153-
154-
$ conda config --add channels https://conda.anaconda.org/conda-forge
155-
$ conda config --add channels https://conda.anaconda.org/domdfcoding
156-
157-
* Then install
158-
159-
.. code-block:: bash
150+
.. code-block:: bash
160151
161-
$ conda install dict2css
152+
$ conda install -c conda-forge dict2css
162153
163154
.. end installation

doc-source/index.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ dict2css
9090
:wheel:
9191
:alt: PyPI - Wheel
9292

93-
.. |conda-version| image:: https://img.shields.io/conda/v/domdfcoding/dict2css?logo=anaconda
94-
:target: https://anaconda.org/domdfcoding/dict2css
93+
.. |conda-version| image:: https://img.shields.io/conda/v/conda-forge/dict2css?logo=anaconda
94+
:target: https://anaconda.org/conda-forge/dict2css
9595
:alt: Conda - Package Version
9696

97-
.. |conda-platform| image:: https://img.shields.io/conda/pn/domdfcoding/dict2css?label=conda%7Cplatform
98-
:target: https://anaconda.org/domdfcoding/dict2css
97+
.. |conda-platform| image:: https://img.shields.io/conda/pn/conda-forge/dict2css?label=conda%7Cplatform
98+
:target: https://anaconda.org/conda-forge/dict2css
9999
:alt: Conda - Platform
100100

101101
.. |license| github-shield::
@@ -145,7 +145,7 @@ Installation
145145
:pypi:
146146
:github:
147147
:anaconda:
148-
:conda-channels: conda-forge, domdfcoding
148+
:conda-channels: conda-forge
149149

150150
.. end installation
151151

pyproject.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ python-implementations = [ "CPython", "PyPy",]
3535
platforms = [ "Windows", "macOS", "Linux",]
3636
license-key = "MIT"
3737

38-
[tool.mkrecipe]
39-
conda-channels = [ "conda-forge", "domdfcoding",]
40-
extras = "all"
41-
4238
[tool.sphinx-pyproject]
4339
github_username = "sphinx-toolbox"
4440
github_repository = "dict2css"

repo_helper.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ author: 'Dominic Davis-Foster'
66
email: 'dominic@davis-foster.co.uk'
77
username: 'sphinx-toolbox'
88
assignee: 'domdfcoding'
9-
primary_conda_channel: 'domdfcoding'
109
version: '0.3.0.post1'
1110
license: 'MIT'
1211
short_desc: 'A μ-library for constructing cascading style sheets from Python dictionaries.'
@@ -18,9 +17,8 @@ docs_fail_on_warning: true
1817
preserve_custom_theme: true
1918
mypy_version: 1.16
2019
python_deploy_version: 3.9
21-
22-
conda_channels:
23-
- conda-forge
20+
on_conda_forge: true
21+
enable_conda: false
2422

2523
python_versions:
2624
- 3.7

0 commit comments

Comments
 (0)