From b67aa29aa70681406ffaaf6ff61d871fd15a6777 Mon Sep 17 00:00:00 2001
From: pgleeson <p.gleeson@gmail.com>
Date: Thu, 10 Aug 2023 09:45:35 +0100
Subject: [PATCH] To v1.0.10; removed 'experimental' build config, uses 'dev'
 as development env/dependencies

@sanjayankur31 pypi upload was complaining again about `modelspec @
git+https://github.com/ModECI/modelspec.git@development#egg=modelspec`
etc. even in dev config, so removing all of these and just having dev
config which is "all deps plus any for testing or development".
Otherwise it's a potentially different set of dependencies for testing
the development branch and experimental branch.
---
 .github/workflows/ci.yml | 12 ------------
 setup.cfg                | 11 +----------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 75a38363d..fa95c2f34 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,20 +40,8 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install git+https://github.com/aarongarrett/inspyred.git@master#egg=inspyred
-        pip install .[all]
-
-    - name: Install package and development deps
-      if: ${{ github.ref == 'refs/heads/development' || github.base_ref == 'development' }}
-      run: |
-        echo "Using deps from development for our repos"
         pip install .[dev]
 
-    - name: Install package and experimental deps
-      if: ${{ github.ref == 'refs/heads/experimental' || github.base_ref == 'experimental' }}
-      run: |
-        echo "Using deps from experimental - assuming development in others"
-        pip install .[experimental]
-
     - name: List packages so far
       run: |
         pip list
diff --git a/setup.cfg b/setup.cfg
index a9a74a3f4..29ed4beb7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = pyNeuroML
-version = 1.0.9
+version = 1.0.10
 author = Padraig Gleeson
 author_email = p.gleeson@gmail.com
 url = https://github.com/NeuroML/pyNeuroML
@@ -108,20 +108,11 @@ all =
 dev =
     pyNeuroML[all]
     airspeed>=0.5.5
-    modelspec @ git+https://github.com/ModECI/modelspec.git@development#egg=modelspec
-    libNeuroML @ git+https://github.com/NeuralEnsemble/libNeuroML.git@development#egg=libNeuroML
-    pylems @ git+https://github.com/LEMS/pylems.git@development#egg=pylems
     pytest
     pytest-cov
     kaleido
     pre-commit
 
-experimental =
-    pyNeuroML[dev]
-
-    modelspec @ git+https://github.com/ModECI/modelspec.git@development#egg=modelspec
-    libNeuroML @ git+https://github.com/NeuralEnsemble/libNeuroML.git@development#egg=libNeuroML
-    pylems @ git+https://github.com/LEMS/pylems.git@development#egg=pylems
 
 doc =
     pyNeuroML[all]