Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

relax python version restrictions #584

Merged
merged 1 commit into from
Nov 27, 2021
Merged

relax python version restrictions #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/unit-tests-pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
# python-version: ['3.7', '3.8', '3.9']
python-version: ['3.7']
python-version: ['3.7', '3.8', '3.9', '3.10']
max-parallel: 5

steps:
Expand Down
5 changes: 5 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ Breaking Changes
Moved ``apsbss`` support to new ``apsbss`` package (install with either ``pip``
or ``conda``). See https://bcda-aps.github.io/apsbss/ for details.

Maintenance
---------------

Now testing with Python versions 3.7 - 3.10.


1.5.4
******
Expand Down
7 changes: 4 additions & 3 deletions apstools/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
__platforms__ = "any"
__zip_safe__ = False
__exclude_project_dirs__ = "docs examples resources".split()
__python_version_required__ = ">=3.7,<3.9"
__python_version_required__ = ">=3.7"

__package_name__ = __project__
__long_description__ = __description__
Expand All @@ -46,8 +46,9 @@
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
# "Programming Language :: Python :: 3.8",
# "Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Astronomy",
"Topic :: Scientific/Engineering :: Bio-Informatics",
Expand Down
5 changes: 2 additions & 3 deletions conda/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,10 @@ build:

requirements:
host:
- python =3.7
- python >=3.7
- pip
run:
- python =3.7
- aps-dm-api
- python >=3.7
- bluesky >=1.6.7
- databroker >=1.2.3
- h5py
Expand Down
8 changes: 2 additions & 6 deletions docs/source/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ If you are using Anaconda Python and have ``conda`` installed, install with this
command::

$ conda install -c aps-anl-tag apstools
$ conda install -c prjemian apstools

Note that channel ``aps-anl-tag`` is for production versions while
channel ``aps-anl-dev`` is for development/testing versions.

pip
---
Expand Down Expand Up @@ -60,10 +56,10 @@ required by ``apstools``. Most packages are available as conda packages
from https://anaconda.org. The others are available on
https://PyPI.python.org. Among the required packages:

- python>=3.6.0
- aps-dm-api
- python>=3.7
- bluesky, databroker, ophyd
- h5py
- pandas
- pyEpics
- pyqt=5
- pyRestTable
Expand Down
3 changes: 1 addition & 2 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ channels:
- aps-anl-tag
- nsls2forge
dependencies:
- python =3.7
- aps-dm-api
- python >=3.7
- bluesky >=1.6.7
- databroker >=1.2.3
- databroker-pack
Expand Down