From e551dcd68ba337b9dcb3f1fee86074447d3ce2ed Mon Sep 17 00:00:00 2001
From: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>
Date: Sep 20 2023 11:09:13 +0000
Subject: Update to 1.1.10


---

diff --git a/python-pyneuroml-0.7.3.tar.gz b/python-pyneuroml-0.7.3.tar.gz
deleted file mode 100644
index e259da9..0000000
Binary files a/python-pyneuroml-0.7.3.tar.gz and /dev/null differ
diff --git a/python-pyneuroml-1.1.0.tar.gz b/python-pyneuroml-1.1.0.tar.gz
new file mode 100644
index 0000000..986be0f
Binary files /dev/null and b/python-pyneuroml-1.1.0.tar.gz differ
diff --git a/python-pyneuroml.spec b/python-pyneuroml.spec
index 25e1651..5ff5e5e 100644
--- a/python-pyneuroml.spec
+++ b/python-pyneuroml.spec
@@ -1,4 +1,4 @@
-%global jnml_version  0.12.0
+%global jnml_version  0.12.3
 
 %global _description %{expand:\
 A single package in Python unifying scripts and modules for reading, writing, \
@@ -8,7 +8,7 @@ Documentation is available at https://docs.neuroml.org
 }
 
 Name:           python-pyneuroml
-Version:        0.7.3
+Version:        1.1.0
 Release:        1%{?dist}
 Summary:        Read, write, simulate and analyze NeuroML2/LEMS models
 
@@ -79,6 +79,10 @@ It makes sure the dependencies are installed.
 
 %pyproject_extras_subpkg -n python3-pyneuroml tune
 
+%pyproject_extras_subpkg -n python3-pyneuroml plotly
+
+%pyproject_extras_subpkg -n python3-pyneuroml nsg
+
 %package doc
 Summary:    Documentation for pyneuroml
 
@@ -88,6 +92,7 @@ Summary:    Documentation for pyneuroml
 %prep
 %autosetup -n pyNeuroML-%{version} -S git
 
+
 # use latest jneuroml that we provide in the COPR
 sed -i 's/JNEUROML_VERSION =.*$/JNEUROML_VERSION = "%{jnml_version}"/' pyneuroml/__init__.py
 
@@ -101,19 +106,14 @@ sed -i 's/\r$//' examples/test.hoc
 find examples/ -name "*.sh" -exec chmod -x '{}' \;
 find examples/ -name "*.nml" -exec chmod -x '{}' \;
 
-# Remove argparse: part of py3 now
-# remove neuromllite req: cyclic dependency
-# add inspyred as dep
-# remove opencv-python
-sed -i -e "/argparse/ d" -e 's/"opencv-python"/""/' -e '/neuromllite>=0.4.1/ d' -e 's/"ppft"/"ppft", "inspyred"/' setup.py
-
 # remove bundled jnml jar
 rm -f pyneuroml/lib/*jar -v
 
 
 %generate_buildrequires
-%pyproject_buildrequires -r -x neuron -x hdf5 -x analysis -x tune -x brian -x netpyne
+%pyproject_buildrequires -r -x neuron -x hdf5 -x analysis -x tune -x brian -x netpyne -x plotly -x nsg
 #-x povray: https://bugzilla.redhat.com/show_bug.cgi?id=2142632
+#-x vispy: not yet packaged
 
 %build
 %pyproject_wheel
@@ -122,16 +122,22 @@ rm -f pyneuroml/lib/*jar -v
 %pyproject_install
 %pyproject_save_files pyneuroml
 
+# install man pages
+install -p -m 0644 -D -t %{buildroot}%{_mandir}/man1/  man/man1/*.1 
+
 %check
 # rely on upstream tests, require lots of data files
-%pyproject_check_import
+# - vispy is not yet packaged for Fedora
+%pyproject_check_import -e *Vispy*
 
 %files -n python3-pyneuroml -f %{pyproject_files}
 %license LICENSE.lesser
 %doc README.md
 %{_bindir}/pynml
+%{_bindir}/pynml-archive
 %{_bindir}/pynml-channelanalysis
 %{_bindir}/pynml-channelml2nml
+%{_bindir}/pynml-plotchan
 %{_bindir}/pynml-plotmorph
 %{_bindir}/pynml-modchananalysis
 %{_bindir}/pynml-povray
@@ -147,6 +153,9 @@ rm -f pyneuroml/lib/*jar -v
 %doc examples
 
 %changelog
+* Wed Sep 20 2023 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.1.0-1
+- Update to 1.1.0
+
 * Fri Dec 02 2022 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.7.3-1
 - Update to 0.7.3