Merge pull request #23 from openscm/tweaks

Tweaks

Author: znicholls

.copier-answers.yml

@@ -1,7 +1,7 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
 _commit: v0.14.3
 _src_path: gl:openscm/copier-core-python-repository
-conda_release: true
+conda_release: false
 email: zebedee.nicholls@climate-energy-college.org
 include_cli: false
 name: Zebedee Nicholls

.github/workflows/install-conda.yaml

@@ -22,7 +22,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ "ubuntu-latest", "macos-latest", "windows-latest" ]
+        os: [
+          "ubuntu-latest",
+          "ubuntu-24.04-arm",
+          "macos-latest",
+          "macos-13",
+          "windows-latest",
+          "windows-11-arm",
+        ]
         # Test against all security and bugfix versions: https://devguide.python.org/versions/
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
         # Check both 'library' install and the 'application' (i.e. locked) install

.github/workflows/install-pypi.yaml

@@ -12,11 +12,6 @@ Basic example of using fgen
 [![PyPI](https://img.shields.io/pypi/v/example-fgen-basic.svg)](https://pypi.org/project/example-fgen-basic/)
 [![PyPI install](https://github.com/openscm/example-fgen-basic/actions/workflows/install-pypi.yaml/badge.svg?branch=main)](https://github.com/openscm/example-fgen-basic/actions/workflows/install-pypi.yaml)
 
-**Conda :**
-[![Conda](https://img.shields.io/conda/vn/conda-forge/example-fgen-basic.svg)](https://anaconda.org/conda-forge/example-fgen-basic)
-[![Conda platforms](https://img.shields.io/conda/pn/conda-forge/example-fgen-basic.svg)](https://anaconda.org/conda-forge/example-fgen-basic)
-[![Conda install](https://github.com/openscm/example-fgen-basic/actions/workflows/install-conda.yaml/badge.svg?branch=main)](https://github.com/openscm/example-fgen-basic/actions/workflows/install-conda.yaml)
-
 **Tests :**
 [![CI](https://github.com/openscm/example-fgen-basic/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/openscm/example-fgen-basic/actions/workflows/ci.yaml)
 [![Coverage](https://codecov.io/gh/openscm/example-fgen-basic/branch/main/graph/badge.svg)](https://codecov.io/gh/openscm/example-fgen-basic)
@@ -65,16 +60,6 @@ because of breaking updates to dependencies.
 
 The locked version of Example fgen - basic can be installed with
 
-=== "mamba"
-    ```sh
-    mamba install -c conda-forge example-fgen-basic-locked
-    ```
-
-=== "conda"
-    ```sh
-    conda install -c conda-forge example-fgen-basic-locked
-    ```
-
 === "pip"
     ```sh
     pip install 'example-fgen-basic[locked]'
@@ -99,33 +84,13 @@ please [raise an issue](https://github.com/openscm/example-fgen-basic/issues).
 
 The (non-locked) version of Example fgen - basic can be installed with
 
-=== "mamba"
-    ```sh
-    mamba install -c conda-forge example-fgen-basic
-    ```
-
-=== "conda"
-    ```sh
-    conda install -c conda-forge example-fgen-basic
-    ```
-
 === "pip"
     ```sh
     pip install example-fgen-basic
     ```
 
 Additional dependencies can be installed using
 
-=== "mamba"
-    If you are installing with mamba, we recommend
-    installing the extras by hand because there is no stable
-    solution yet (see [conda issue #7502](https://github.com/conda/conda/issues/7502))
-
-=== "conda"
-    If you are installing with conda, we recommend
-    installing the extras by hand because there is no stable
-    solution yet (see [conda issue #7502](https://github.com/conda/conda/issues/7502))
-
 === "pip"
     ```sh
     # To add plotting dependencies

README.md

@@ -0,0 +1,3 @@
+- Dropped conda-related things as we won't make the package installable via conda
+- Added tests on more architectures to the test PyPI install workflow
+- Removed FORD config from the source distribution

changelog/23.trivial.md

@@ -106,15 +106,6 @@ The steps required are the following:
    This triggers a release to PyPI
    (which you can then add to the release if you want).
 
-1. Go to your conda feedstock repository
-   (likely something like https://github.com/conda-forge/example-fgen-basic-feedstock)
-   and make a new merge request that updates your `recipe/meta.yaml` file
-   to point to the newly released version on PyPI.
-
-   - If you have updated any dependencies, copy these across to your `recipe/meta.yaml` file.
-   - If you are releasing a locked version on conda too,
-     you can generate the pins for your lock file with `scripts/print-conda-recipe-pins.py`.
-
 1. That's it, release done, make noise on social media of choice, do whatever
    else
 

docs/development.md

@@ -17,6 +17,7 @@ def main():
     exclude = [
         ".github",
         "docs",
+        "ford_config.md",
         "tests",
         "changelog",
         "stubs",
@@ -25,7 +26,6 @@ def main():
         Path("scripts") / "propogate-pyproject-metadata.py",
         Path("scripts") / "test-install.py",
         Path("scripts") / "changelog-to-release-template.py",
-        Path("scripts") / "print-conda-recipe-pins.py",
         # Keep this one
         # Path("scripts") / "strip-sdist.py",
         ".pre-commit-config.yaml",