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

BTK with python 3.8 #227

Merged
merged 5 commits into from
Oct 6, 2021
Merged

BTK with python 3.8 #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cec0fc9
enforce potry 1.1.10
ismael-mendoza Oct 6, 2021
5b954f3
correct classifiers and specific requirement for python 3.7 and 3.8
ismael-mendoza Oct 6, 2021
0e48507
python version badge from pypi
ismael-mendoza Oct 6, 2021
b69f642
poetry must be 1.1.10, specifiy both 3.7/3.8 in relevant tests
ismael-mendoza Oct 6, 2021
4f9d704
poetry update
ismael-mendoza Oct 6, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Install Poetry
run: |
pip install --upgrade pip
pip install poetry
pip install poetry==1.1.10

- name: Poetry cache
uses: actions/cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7]
python-version: [3.7, 3.8]

steps:
- name: Checkout github repo
Expand All @@ -33,7 +33,7 @@ jobs:
- name: Install Poetry
run: |
pip install --upgrade pip
pip install poetry
pip install poetry==1.1.10

- name: Poetry cache
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7]
python-version: [3.7, 3.8]

steps:
- name: Checkout github repo (+ download lfs dependencies)
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINER.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ conda install -c conda-forge galsim

# poetry allows us to install all dependencies directly from pyproject.toml (except galsim!)
# poetry reuses the current "btk" virtual environment from conda.
conda install -c conda-forge poetry
conda install -c conda-forge poetry==1.1.10
poetry install

# finally activate pre-commit
Expand Down
5 changes: 4 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
[![codecov](https://codecov.io/gh/LSSTDESC/BlendingToolKit/branch/main/graph/badge.svg)](https://codecov.io/gh/LSSTDESC/BlendingToolKit)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
[![Python 3.7](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/downloads/release/python-370/)
[![PyPI][pypi-badge]][pypi]

[pypi-badge]: https://img.shields.io/pypi/pyversions/blending-toolkit?color=yellow&logo=pypi
[pypi]: https://pypi.org/project/blending-toolkit/

# BlendingToolKit
Framework for fast generation and analysis of galaxy blends catalogs. This toolkit is a convenient way of
Expand Down
48 changes: 24 additions & 24 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ authors = [
"Eric Aubourg",
]
classifiers = [
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
]
Expand All @@ -38,7 +39,7 @@ pandas = "~1.3.3"
peigen = {version = "~0.0.9", optional = true}
proxmin = {version = "~0.6.11", optional = true}
pybind11 = {version = "~2.7.0", optional = true}
python = "^3.7.1"
python = ">= 3.7.0, < 3.9.0"
scikit-image = "~0.18.3"
scipy = "~1.6.1"
seaborn = "~0.11.2"
Expand Down Expand Up @@ -70,7 +71,7 @@ btk = "btk.__main__:run"

[tool.black]
line-length = 100
target-version = ['py37']
target-version = ['py37', 'py38']

[tool.poetry.extras]
galsim-hub = ["galsim-hub", "tensorflow"]
Expand Down