Skip to content

Commit

Permalink
Merge pull request #72 from linea-it/71-fix-lib-to-work-with-python-3…
Browse files Browse the repository at this point in the history
…12-and-update-depoendency-requirements

Fixed lib to work with python 3.12
  • Loading branch information
gschwend authored Mar 20, 2024
2 parents 31544cd + 261e4d7 commit 2c89e66
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 27 deletions.
1 change: 0 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"aaron-bond.better-comments",
"PKief.material-icon-theme",
"njpwerner.autodocstring",
"TabNine.tabnine-vscode",
"ms-azuretools.vscode-docker"
]
}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
build:

name: build_doc
runs-on: ubuntu-latest

steps:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ on:

jobs:
build:
name: lint
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10']
python-version: ['3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v3
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ permissions:

jobs:
pypi-publish:
name: Upload release to PyPI
name: pypi_publish
runs-on: ubuntu-latest
environment:
name: pypi
Expand All @@ -37,7 +37,4 @@ jobs:
- name: Build package
run: python -m build
- name: Publish package
uses: pypa/gh-action-pypi-publish@release/v1
# with:
# user: __token__
# password: ${{ secrets.PYPI_API_TOKEN }}
uses: pypa/gh-action-pypi-publish@release/v1
4 changes: 2 additions & 2 deletions .github/workflows/smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ on:

jobs:
build:

name: smoke_test
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10']
python-version: ['3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/testing-and-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ on:

jobs:
build:

name: test_and_coverage
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10']
python-version: ['3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v3
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@

A Python library to access data from the [Photo-z Server](https://pz-server-dev.linea.org.br/).

The Photo-z Server is an online service based on software developed and delivered as part of the in-kind contribution program BRA-LIN, from LIneA to the Rubin Observatory's LSST. The Photo-z Server is open source, and the code is available on the GitHub repository [linea-it/pzserver_app](https://github.com/linea-it/pzserver_app).
The Photo-z Server is an online service based on software developed and delivered as part of the in-kind contribution program BRA-LIN, from LIneA to the Rubin Observatory's LSST. The Photo-z Server is open source, and the code is
available on the GitHub repository [linea-it/pzserver_app](https://github.com/linea-it/pzserver_app).

An overview of this and other contributions is available [here](https://linea-it.github.io/pz-lsst-inkind-doc/).
The API documentation is available [here](https://linea-it.github.io/pzserver).
6 changes: 3 additions & 3 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sphinx==6.1.3
sphinx_rtd_theme==1.2.0
sphinx-autoapi==2.0.1
sphinx>=7.0.0,<8
sphinx_rtd_theme>1.2.0,<2
sphinx-autoapi>=3.0.0,<4
ghp-import
nbsphinx
ipython
Expand Down
27 changes: 16 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
[project]
name = "pzserver"
license = {file = "LICENSE"}
dynamic = ["version"]
readme = "README.md"
authors = [
{ name = "LIneA", email = "[email protected]" }
]
requires-python = ">=3.8,<3.13"
classifiers = [
"Development Status :: 4 - Beta",
"License :: OSI Approved :: MIT License",
"Intended Audience :: Developers",
"Intended Audience :: Science/Research",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dynamic = ["version"]
dependencies = [
"deprecated",
"ipykernel", # Support for Jupyter notebooks
"numpy>=1.23, <1.24",
"numpy>=1.23",
"pandas>=1.2.0",
"requests>=2.23.0",
"astropy>=5.0.0",
Expand All @@ -26,7 +31,6 @@ dependencies = [
"Jinja2>=3.1.2",
"ipython>=8.5.0",
"h5py>=3.8.0",
"jupyterlab",
]

# On a mac, install optional dependencies with `pip install '.[dev]'` (include the single quotes)
Expand All @@ -35,24 +39,25 @@ dev = [
"pytest",
"pytest-cov", # Used to report total code coverage
"pre-commit", # Used to run checks before finalizing a git commit
"sphinx==6.1.3", # Used to automatically generate documentation
"sphinx_rtd_theme==1.2.0", # Used to render documentation
"sphinx-autoapi==2.0.1", # Used to automatically generate api documentation
"sphinx>=7.0.0,<8", # Used to automatically generate documentation
"sphinx_rtd_theme>=1.2.0,<2", # Used to render documentation
"sphinx-autoapi>=3.0.0,<4", # Used to automatically generate api documentation
"pylint", # Used for static linting of files
# if you add dependencies here while experimenting in a notebook and you
# want that notebook to render in your documentation, please add the
# dependencies to ./docs/requirements.txt as well.
"ipykernel", # Support for Jupyter notebooks
"nbconvert", # Needed for pre-commit check to clear output from Python notebooks
"nbsphinx", # Used to integrate Python notebooks into Sphinx documentation
"ipython", # Also used in building notebooks into Sphinx
"jupyterlab",
"matplotlib", # Used in sample notebook intro_notebook.ipynb
"numpy", # Used in sample notebook intro_notebook.ipynb
]

[build-system]
requires = [
"setuptools>=45", # Used to build and package the Python project
"setuptools_scm>=6.2", # Gets release version from git. Makes it available programmatically
"setuptools>=66", # Used to build and package the Python project
"setuptools_scm>=8", # Gets release version from git. Makes it available programmatically
]
build-backend = "setuptools.build_meta"

Expand Down

0 comments on commit 2c89e66

Please sign in to comment.