Skip to content

Commit

Permalink
To v1.0.10; removed 'experimental' build config, uses 'dev' as develo…
Browse files Browse the repository at this point in the history
…pment 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.
  • Loading branch information
pgleeson committed Aug 10, 2023
1 parent 6736406 commit b67aa29
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
12 changes: 0 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 1 addition & 10 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = pyNeuroML
version = 1.0.9
version = 1.0.10
author = Padraig Gleeson
author_email = [email protected]
url = https://github.com/NeuroML/pyNeuroML
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit b67aa29

Please sign in to comment.