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

Update dependencies to current versions, add python 3.11 CI #1121

Merged
merged 11 commits into from
Jun 15, 2023
Merged

Update dependencies to current versions, add python 3.11 CI #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4f2562e
bump gammapy version
rlopezcoto Jun 15, 2023
8d1b302
bump ctapipe version
rlopezcoto Jun 15, 2023
f7734c8
drop python 3.8 from CI, add 3.11
rlopezcoto Jun 15, 2023
91a273d
update scikit learn for python 3.11 support
rlopezcoto Jun 15, 2023
618fac8
update matplotlib for python 3.11 support
rlopezcoto Jun 15, 2023
ecb250f
update python version for docs build
rlopezcoto Jun 15, 2023
b322c68
update python version for pyflakes
rlopezcoto Jun 15, 2023
607f09e
remove pin to numpy version
rlopezcoto Jun 15, 2023
c8d2a41
require python 3.9 in stup.cfg
rlopezcoto Jun 15, 2023
ac7d379
Remove verbose from sklearn model configs
maxnoe Jun 15, 2023
d9dfc81
Merge branch 'bump_gammapy' of https://github.com/cta-observatory/cta…
rlopezcoto Jun 15, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.9

- name: pyflakes
run: |
Expand All @@ -39,8 +39,8 @@ jobs:

strategy:
matrix:
python-version: ["3.8", "3.9", "3.10"]
ctapipe-version: ["v0.19.0"]
python-version: ["3.9", "3.10", "3.11"]
ctapipe-version: ["v0.19.2"]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.9

- name: Install doc dependencies
run: |
Expand Down
10 changes: 5 additions & 5 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ channels:
- default
dependencies:
- python=3.10
- numpy=1.22
- numpy
- astropy=5
- pip
- ctapipe=0.19
- gammapy=1
- ctapipe=0.19.2
- gammapy=1.1
- h5py
- ipython
- jupyter
- matplotlib=3.5
- matplotlib=3.7
- notebook
- iminuit>=2
- joblib~=1.2.0
- toml
- protobuf=3.20
- pyparsing
- scikit-learn=1.0
- scikit-learn=1.2
- sphinx=4
- sphinx-automodapi
- sphinx_rtd_theme
Expand Down
4 changes: 0 additions & 4 deletions lstchain/data/lstchain_lhfit_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
"min_weight_fraction_leaf": 0.0,
"oob_score": false,
"random_state": 42,
"verbose": 0,
"warm_start": false
},

Expand All @@ -97,7 +96,6 @@
"min_weight_fraction_leaf": 0.0,
"oob_score": false,
"random_state": 42,
"verbose": 0,
"warm_start": false
},

Expand All @@ -115,7 +113,6 @@
"bootstrap": true,
"oob_score": false,
"random_state": 42,
"verbose": 0.0,
"warm_start": false,
"class_weight": null
},
Expand All @@ -134,7 +131,6 @@
"bootstrap": true,
"oob_score": false,
"random_state": 42,
"verbose": 0.0,
"warm_start": false,
"class_weight": null
},
Expand Down
4 changes: 0 additions & 4 deletions lstchain/data/lstchain_standard_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
"min_weight_fraction_leaf": 0.0,
"oob_score": false,
"random_state": 42,
"verbose": 0,
"warm_start": false
},

Expand All @@ -97,7 +96,6 @@
"min_weight_fraction_leaf": 0.0,
"oob_score": false,
"random_state": 42,
"verbose": 0,
"warm_start": false
},

Expand All @@ -115,7 +113,6 @@
"bootstrap": true,
"oob_score": false,
"random_state": 42,
"verbose": 0.0,
"warm_start": false,
"class_weight": null
},
Expand All @@ -134,7 +131,6 @@
"bootstrap": true,
"oob_score": false,
"random_state": 42,
"verbose": 0.0,
"warm_start": false,
"class_weight": null
},
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ long_description_content_type = text/markdown
github_project = cta-observatory/cta-lstchain

[options]
python_requires = >=3.8
python_requires = >=3.9
8 changes: 4 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@ def find_scripts(script_dir, prefix):
install_requires=[
'astropy~=5.0',
'bokeh~=2.0',
'ctapipe~=0.19.0',
'ctapipe~=0.19.2',
'ctapipe_io_lst~=0.21.0',
'ctaplot~=0.6.2',
'eventio>=1.9.1,<2.0.0a0', # at least 1.1.1, but not 2
'gammapy~=1.0',
'gammapy~=1.1',
'h5py',
'iminuit>=2',
'joblib~=1.2.0',
'matplotlib~=3.5',
'matplotlib~=3.7',
'numba',
'numpy',
'pandas',
'protobuf~=3.20.0',
'pyirf~=0.8.0',
'scipy>=1.8',
'seaborn',
'scikit-learn~=1.0',
'scikit-learn~=1.2',
'tables',
'toml',
'pymongo',
Expand Down