diff --git a/.bumpversion.cfg b/.bumpversion.cfg deleted file mode 100644 index 1a82d4c0..00000000 --- a/.bumpversion.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[bumpversion] -current_version = 0.1.0 -commit = True -tag = True - -[bumpversion:file:allensdk/ipfx/__init__.py] -search = __version__ = '{current_version}' -replace = __version__ = '{new_version}' - -[bumpversion:file:setup.py] -search = version = '{current_version}' -replace = version = '{new_version}' - -[bumpversion:file:.cookiecutter/.cookiecutter.json] -search = version = "{current_version}" -replace = version = "{new_version}" - -[bumpversion:file:.cookiecutter/.cookiecutter.yaml] -search = version = {current_version} -replace = version = {new_version} diff --git a/AUTHORS.rst b/AUTHORS.rst index 50b31a90..21b36d48 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -12,3 +12,4 @@ Credits * Nile Graddis @nilegraddis * Sergey Gratiy @sgratiy * Yang Yu @gnayuy +* Sherif Soliman @sheriferson \ No newline at end of file diff --git a/README.md b/README.md index 303169f2..af5abca1 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,6 @@ We welcome contributions! Please see our [contribution guide](https://github.com Deprecation Warning ------------------- -The 1.0.0 release of ipfx brings some new features, like NWB2 support, along with improvements to our documentation and testing. We will also drop support for -- NWB1 -- Python 2 -Older versions of ipfx will continue to be available, but may receive only occasional bugfixes and patches. +The 1.1.0 release of IPFX drops support for Python 3.6 which reached end of life and stopped receiving security updated on December 23, 2021. +IPFX is now tested on Python 3.9 and higher. diff --git a/docker/README.md b/docker/README.md new file mode 100644 index 00000000..73ca607d --- /dev/null +++ b/docker/README.md @@ -0,0 +1,21 @@ +# Docker images for on premise testing + +This directory contains Dockerfiles for building images for running on-prem tests that require internal Allen Institute resources. On-prem tests use GitHub self-hosted runners that will run tests on docker images built from these Dockerfiles. + +Our light and on-prem tests are defined in [our workflow file](../.github/workflows/github-actions-ci.yml "Link to GitHub Actions workflow for light and on-prem tests"). + +- See [here](https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners) for more information on self-hosted runners. +- See [here](https://docs.github.com/en/actions/hosting-your-own-runners/adding-self-hosted-runners) for more information on adding self-hosted runners to a GitHub repository. + +## Building images + +If you are an Allen Institute developer, you will have instructions on how to access the machine running the IPFX self-hosted runner. + +On this machine you can create the Docker image corresponding to the Python versions we test on by running: + +``` +cd ipfx/docker/py39 +docker build -t ipfx_py39:latest . +``` + +And this should be sufficient for the on-prem tests defined in our GitHub workflow to run. diff --git a/requirements-py3.6.txt b/requirements-py3.6.txt deleted file mode 100644 index 4deb5485..00000000 --- a/requirements-py3.6.txt +++ /dev/null @@ -1,18 +0,0 @@ -argschema<2.0.0 -allensdk -dictdiffer -h5py==2.10.0 -marshmallow==3.0.0rc6 -matplotlib>=1.4.3 -methodtools -numpy>=1.15.4,<1.19.0 -pandas>=0.25.1,<=0.25.3 -pg8000 -pillow -pyabf<2.3.0 -pynwb>=1.3.2,<2.0.0 -pyYAML<6.0.0 -ruamel.yaml<0.18.0 -scipy>=0.15.1 -simplejson>=3.10.0 -watchdog diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 7d674a67..00000000 --- a/tox.ini +++ /dev/null @@ -1,10 +0,0 @@ -[tox] -envlist = python2.7, python3.6 - -[testenv] - -deps = - pytest - -commands = pytest -