diff --git a/.gitignore b/.gitignore index ad72aae..49b6b62 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /probeinterface-0.2.14.tar.gz /probeinterface-0.2.15.tar.gz /probeinterface-0.2.16.tar.gz +/probeinterface-0.2.17.tar.gz diff --git a/ASSY-156-P-1.json b/ASSY-156-P-1.json index e6b8ea2..83b0aab 100644 --- a/ASSY-156-P-1.json +++ b/ASSY-156-P-1.json @@ -1,6 +1,6 @@ { "specification": "probeinterface", - "version": "0.2.11", + "version": "0.2.16", "probes": [ { "ndim": 2, diff --git a/python-probeinterface.spec b/python-probeinterface.spec index 84773ff..2cca6fe 100644 --- a/python-probeinterface.spec +++ b/python-probeinterface.spec @@ -5,7 +5,7 @@ %bcond doc_pdf 1 Name: python-probeinterface -Version: 0.2.16 +Version: 0.2.17 Release: %autorelease Summary: Handles probe layout, geometry, and wiring to device @@ -21,7 +21,7 @@ Source0: %{url}/archive/%{version}/probeinterface-%{version}.tar.gz # https://github.com/SpikeInterface/probeinterface/issues/70. # # This URL comes from probeinterface/library.py, where it is called public_url. -%global probe_url https://web.gin.g-node.org/spikeinterface/probeinterface_library/raw/master +%global probe_url https://raw.githubusercontent.com/SpikeInterface/probeinterface_library/main Source1: %{probe_url}/neuronexus/A1x32-Poly3-10mm-50-177/A1x32-Poly3-10mm-50-177.json Source2: %{probe_url}/cambridgeneurotech/ASSY-156-P-1/ASSY-156-P-1.json @@ -92,6 +92,11 @@ Summary: Documentation for probeinterface # Do not require an exact matplotlib version to build documentation: sed -r -i 's/(matplotlib)==/\1>=/' pyproject.toml +# Drop coverage tools from test dependencies. +# +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters +sed -r -i 's/^([[:blank:]])(.*pytest-cov.*,)$/\1# \2/' pyproject.toml + # Pre-populate the probe definition cache PROBE_CACHE="${HOME}/.config/probeinterface/library" install -t "${PROBE_CACHE}/neuronexus" -p -m 0644 -D '%{SOURCE1}' @@ -105,17 +110,20 @@ install -t "${PROBE_CACHE}/cambridgeneurotech" -p -m 0644 -D '%{SOURCE2}' %build %pyproject_wheel -%if %{with doc_pdf} -PYTHONPATH="${PWD}" %make_build -C doc latex \ - SPHINXOPTS='-j%{?_smp_build_ncpus}' -%make_build -C doc/_build/latex LATEXMKOPTS='-quiet' -%endif - %install %pyproject_install %pyproject_save_files probeinterface +%if %{with doc_pdf} +# Building this in %%install instead of %%build is a hack, but it is the +# easiest workaround for the unusual fact that importing the package requires +# proper distribution metadata. +PYTHONPATH='%{buildroot}%{python3_sitelib}' %make_build -C doc latex \ + SPHINXOPTS='-j%{?_smp_build_ncpus}' +%make_build -C doc/_build/latex LATEXMKOPTS='-quiet' +%endif + %check # Skip tests that unconditionally download probe interface definitions and diff --git a/sources b/sources index 6587823..2254aca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (probeinterface-0.2.16.tar.gz) = 7c38534dbcab837df1289074db054e31c0768bceefafeb6d70051f88a6ac289d664d77cd6c456f40e7c52a7b60a09e80a4a4fe5e8f491121157b0bbb4d5c1f84 +SHA512 (probeinterface-0.2.17.tar.gz) = 23ee04f09f07bf9834f0395266c6af5d0b4a53d9c866946777f42aa12ecff6568b3b87f96d034903624a0c757b056dc26f860ef76b35414639f5459c2395721d