Skip to content

Commit

Permalink
Test fix to conda circleci (#1559)
Browse files Browse the repository at this point in the history
* Test fix to conda circleci

* fix

* Fix

* Try fix

* FIx

* Update changelog, uncomment extra runs
  • Loading branch information
rly authored Sep 27, 2022
1 parent 787afc7 commit d901388
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
17 changes: 14 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,29 +96,40 @@ references:
- run:
name: Configure conda
command: |
pip install --upgrade pip
conda update -n base -c defaults conda
conda install -n base -c defaults conda=4.13.0
conda config --set always_yes yes --set changeps1 no
conda config --add channels conda-forge
conda install python=$CONDA_PYTHON_VER
conda create --name test python=$CONDA_PYTHON_VER --yes
conda init bash
source ~/.bashrc
conda activate test
pip install --upgrade pip
# work around incompatibilities between virtualenv & importlib-metadata
if [[ "${TEST_TOX_ENV}" == *"py37"* ]]; then
conda install "importlib-metadata=1.7"
else
conda install importlib-metadata
fi
conda install tox
conda list
pip list
- run:
name: Run the tests
command: |
source ~/.bashrc
conda activate test
tox -e $TEST_TOX_ENV
- run:
name: Build wheel and source distribution
command: |
source ~/.bashrc
conda activate test
tox -e $BUILD_TOX_ENV
- run:
name: Test installation from a wheel
command: |
source ~/.bashrc
conda activate test
tox -e $TEST_WHEELINSTALL_ENV --recreate --installpkg dist/*-none-any.whl
gallery-steps: &gallery-steps
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
### Bug fixes
- Fixed bug in ``pynwb.testing.mock.file.mock_NWBFile`` to identifier UUID to string. @oruebel
[#1557](https://github.com/NeurodataWithoutBorders/pynwb/pull/1557)
- Fixed CircleCI configuration. @rly [#1559](https://github.com/NeurodataWithoutBorders/pynwb/pull/1559)

## PyNWB 2.1.1 (September 1, 2022)

### Documentation and tutorial enhancements:
- Added support for explicit ordering of sphinx gallery tutorials in the docs. @oruebel
- Added support for explicit ordering of sphinx gallery tutorials in the docs. @oruebel
[#1504](https://github.com/NeurodataWithoutBorders/pynwb/pull/1504), @bdichter
[#1495](https://github.com/NeurodataWithoutBorders/pynwb/pull/1495)
- Added developer guide on how to create a new tutorial. @oruebel
Expand Down Expand Up @@ -39,7 +40,7 @@
[#1548](https://github.com/NeurodataWithoutBorders/pynwb/pull/1548)
- Updated requirements, including allowing numpy 1.23. @rly
[#1550](https://github.com/NeurodataWithoutBorders/pynwb/pull/1550)
- Enhanced docs for ``LabMetaData`` to clarify its usage. @oruebel
- Enhanced docs for ``LabMetaData`` to clarify its usage. @oruebel
[#1546](https://github.com/NeurodataWithoutBorders/pynwb/pull/1546)
- Add testing/mock, which provides mock neurodata objects for testing. @bendichter
[#1454](https://github.com/NeurodataWithoutBorders/pynwb/pull/1454)
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
envlist = py37, py38, py39

[testenv]
download = True
usedevelop = True
setenv = PYTHONDONTWRITEBYTECODE = 1
setenv =
PYTHONDONTWRITEBYTECODE = 1
VIRTUALENV_PIP = 22.2.2
install_command =
pip install -U {opts} {packages}

Expand Down

0 comments on commit d901388

Please sign in to comment.