Skip to content

Commit

Permalink
Changes to comply with JAX 0.4 and Python 3.8 as minimum versions
Browse files Browse the repository at this point in the history
  • Loading branch information
shailesh1729 committed Oct 15, 2023
1 parent 1cfee59 commit 7539eb9
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 38 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Python 3
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: '3.8'
- name: Setup timezone
uses: zcong1993/setup-timezone@master
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Python 3
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.8'
- name: Install dependencies
run: |
python --version
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sphinx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ jobs:
name: Sphinx Build and Publish
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: Install system packages
run: |
sudo apt-get update -y
sudo apt-get install pandoc libgl1-mesa-dev optipng
- name: Install Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.8'
- name: Cache pip
uses: actions/cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file.

[Documentation](https://cr-sparse.readthedocs.io/en/latest/)

## [0.4.0] - 2023-10-15
## [0.4.0] - 2023-10-16

[Documentation](https://cr-sparse.readthedocs.io/en/v0.4.0/)

Expand Down
3 changes: 1 addition & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ Supported Platforms
``CR-Sparse`` can run on any platform supported by ``JAX``.
We have tested ``CR-Sparse`` on Mac and Linux platforms and Google Colaboratory.

* The latest code in the library has been tested against JAX 0.3.14.
* The last released version of CR-Sparse (0.2.2) was tested against JAX 0.1.55 and later JAX 0.1.x versions.
* The latest code in the library has been tested against JAX 0.4.

``JAX`` is not officially supported on Windows platforms at the moment.
Although, it is possible to build it from source using Windows Subsystems for Linux.
Expand Down
7 changes: 0 additions & 7 deletions requirements.txt

This file was deleted.

4 changes: 2 additions & 2 deletions requirements/requirements-docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ sphinxcontrib-bibtex>=1.0.0
sphinx-autodoc-typehints>=1.11.1
IPython>=7.16.1
ipykernel>=5.3.4
pandoc>>=1.0.2
pandoc>=1.0.2
nbsphinx>=0.8.0
requests
cr-nimble
cr-nimble>=0.4.0
2 changes: 2 additions & 0 deletions requirements/requirements-examples.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
cr-nimble>=0.4.0
cr-wavelets>=0.4.0
15 changes: 2 additions & 13 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
chex>=0.1.5
jax>=0.3.20
jaxlib>=0.3.20
numpy>=1.18.0
sympy>=1.6
scipy
matplotlib
pandas>=1.0.0
requests>=2.20.0
imageio
click
cr-nimble>=0.3.1
cr-wavelets>=0.3.0
cr-nimble>=0.4.0
cr-wavelets>=0.4.0
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[metadata]
description-file = README.rst
description_file = README.rst
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,9 @@ def _parse_requirements(filename):
# 'Operating System :: Microsoft :: Windows',
# Specify the Python versions you support here. In particular, ensure
# that you indicate whether you support Python 2, Python 3 or both.
# 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: Implementation :: CPython',
],
project_urls={
Expand All @@ -95,7 +94,7 @@ def _parse_requirements(filename):
packages=find_namespace_packages('src', include=['cr.*']),
package_dir={'': 'src'},
py_modules=[splitext(basename(path))[0] for path in glob('src/*.py')],
python_requires=">=3.6",
python_requires=">=3.8",
# Alternatively, if you want to distribute just a my_module.py, uncomment
# this:
# py_modules=["my_module"],
Expand Down

0 comments on commit 7539eb9

Please sign in to comment.