diff --git a/.copier-answers.yml b/.copier-answers.yml index d39acfa9..6ac64f97 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: 3561fcd +_commit: 024a41b _src_path: gh:scipp/copier_template description: Diffraction data reduction for the European Spallation Source max_python: '3.13' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f88b3447..66b8a942 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,29 +10,6 @@ defaults: shell: bash -l {0} # required for conda env jobs: - build_conda: - name: Conda build - runs-on: 'ubuntu-24.04' - - steps: - - uses: actions/checkout@v4 - with: - submodules: true - fetch-depth: 0 # history required so setuptools_scm can determine version - - - uses: mamba-org/setup-micromamba@v1 - with: - environment-name: build-env - create-args: >- - conda-build - boa - - run: conda mambabuild --channel conda-forge --channel scipp --no-anaconda-upload --override-channels --output-folder conda/package conda - - - uses: actions/upload-artifact@v4 - with: - name: conda-package-noarch - path: conda/package/noarch/*.tar.bz2 - build_wheels: name: Wheels runs-on: 'ubuntu-24.04' @@ -60,7 +37,7 @@ jobs: upload_pypi: name: Deploy PyPI - needs: [build_wheels, build_conda] + needs: [build_wheels] runs-on: 'ubuntu-24.04' environment: release permissions: @@ -70,25 +47,8 @@ jobs: - uses: actions/download-artifact@v4 - uses: pypa/gh-action-pypi-publish@v1.12.4 - upload_conda: - name: Deploy Conda - needs: [build_wheels, build_conda] - runs-on: 'ubuntu-24.04' - if: github.event_name == 'release' && github.event.action == 'published' - - steps: - - uses: actions/download-artifact@v4 - - uses: mamba-org/setup-micromamba@v1 - with: - environment-name: upload-env - # frozen python due to breaking removal of 'imp' in 3.12 - create-args: >- - anaconda-client - python=3.11 - - run: anaconda --token ${{ secrets.ANACONDATOKEN }} upload --user scipp --label main $(ls conda-package-noarch/*.tar.bz2) - docs: - needs: [upload_conda, upload_pypi] + needs: [upload_pypi] uses: ./.github/workflows/docs.yml with: publish: ${{ github.event_name == 'release' && github.event.action == 'published' }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 77a6e9ca..3a7dacc9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,6 @@ repos: - id: check-merge-conflict - id: check-toml - id: check-yaml - exclude: conda/meta.yaml - id: detect-private-key - id: trailing-whitespace args: [ --markdown-linebreak-ext=md ] diff --git a/README.md b/README.md index 38e76c1f..b2663768 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md) [![PyPI badge](http://img.shields.io/pypi/v/essdiffraction.svg)](https://pypi.python.org/pypi/essdiffraction) -[![Anaconda-Server Badge](https://anaconda.org/scipp/essdiffraction/badges/version.svg)](https://anaconda.org/scipp/essdiffraction) +[![Anaconda-Server Badge](https://anaconda.org/conda-forge/essdiffraction/badges/version.svg)](https://anaconda.org/conda-forge/essdiffraction) [![License: BSD 3-Clause](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](LICENSE) # ESSdiffraction diff --git a/conda/meta.yaml b/conda/meta.yaml deleted file mode 100644 index e9c2551a..00000000 --- a/conda/meta.yaml +++ /dev/null @@ -1,57 +0,0 @@ -package: - name: essdiffraction - - version: {{ GIT_DESCRIBE_TAG }} - -source: - path: .. - - -{% set pyproject = load_file_data('pyproject.toml') %} -{% set dependencies = pyproject.get('project', {}).get('dependencies', {}) %} -{% set test_dependencies = pyproject.get('project', {}).get('optional-dependencies', {}).get('test', {}) %} - - -requirements: - build: - - setuptools - - setuptools_scm - run: - - python>=3.10 - - {# Conda does not allow spaces between package name and version, so remove them #} - {% for package in dependencies %} - - {% if package == "graphviz" %}python-graphviz{% else %}{{ package|replace(" ", "") }}{% endif %} - {% endfor %} - - -test: - imports: - - ess.diffraction - requires: - - {# Conda does not allow spaces between package name and version, so remove them #} - {% for package in test_dependencies %} - - {% if package == "graphviz" %}python-graphviz{% else %}{{ package|replace(" ", "") }}{% endif %} - {% endfor %} - - - source_files: - - pyproject.toml - - tests/ - commands: - # We ignore warnings during release package builds - - python -m pytest -Wignore tests - -build: - noarch: python - script: - - python -m pip install . - -about: - home: https://github.com/scipp/essdiffraction - license: BSD-3-Clause - summary: Diffraction data reduction for the European Spallation Source - description: Diffraction data reduction for the European Spallation Source - dev_url: https://github.com/scipp/essdiffraction - doc_url: https://scipp.github.io/essdiffraction diff --git a/docs/conf.py b/docs/conf.py index 50955d39..1004b21f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -203,7 +203,7 @@ }, { "name": "Conda", - "url": "https://anaconda.org/scipp/essdiffraction", + "url": "https://anaconda.org/conda-forge/essdiffraction", "icon": "fa-custom fa-anaconda", "type": "fontawesome", }, @@ -287,7 +287,8 @@ def do_not_plot(*args, **kwargs): "https://www.sciencedirect.com/science/article/pii/S2773183922000374", # Linkcheck seems to be denied access by some DOI resolvers. # Since DOIs are supposed to be permanent, we don't need to check them.' - r'https://doi\.org/', + r'https?://doi\.org/', + r'https?://dx\.doi\.org/', ] # -- Options for bibtex --------------------------------------------------- diff --git a/docs/user-guide/installation.md b/docs/user-guide/installation.md index 0009aa45..f7031178 100644 --- a/docs/user-guide/installation.md +++ b/docs/user-guide/installation.md @@ -10,7 +10,7 @@ pip install essdiffraction ```` ````{tab-item} conda ```sh -conda install -c conda-forge -c scipp essdiffraction +conda install -c conda-forge essdiffraction ``` ```` ````` diff --git a/requirements/docs.txt b/requirements/docs.txt index 0291d17e..d7f5618c 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -10,6 +10,8 @@ accessible-pygments==0.0.5 # via pydata-sphinx-theme alabaster==1.0.0 # via sphinx +appnope==0.1.4 + # via ipykernel attrs==25.3.0 # via # jsonschema