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.

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 dev #178

Merged
merged 44 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
9bb71aa
Merge pull request #177 from EhsanGharibNezhad/dev
EhsanGharibNezhad Nov 22, 2023
7579ee1
update travis
EhsanGharibNezhad Nov 27, 2023
e0a86fc
- Edit module predictor:
EhsanGharibNezhad Nov 27, 2023
88f6aba
- Edit module predictor:
EhsanGharibNezhad Nov 27, 2023
7a03cf6
update travis.yml
EhsanGharibNezhad Nov 27, 2023
8d40d7c
update travis.yml
EhsanGharibNezhad Nov 27, 2023
3b15ef4
update travis.yml
EhsanGharibNezhad Nov 27, 2023
03ec103
update readme
EhsanGharibNezhad Nov 27, 2023
f23b627
update readme
EhsanGharibNezhad Nov 27, 2023
40862d1
update travis.yml
EhsanGharibNezhad Nov 27, 2023
adbb5d7
update travis.yml
EhsanGharibNezhad Nov 27, 2023
9c38346
update travis.yml
EhsanGharibNezhad Nov 27, 2023
850b70a
update travis.yml and readme
EhsanGharibNezhad Nov 27, 2023
d5398c6
update travis.yml and readme
EhsanGharibNezhad Nov 27, 2023
3a8e87f
update whole travis cI, add requirements etc
EhsanGharibNezhad Nov 27, 2023
9b45376
update travis yml
EhsanGharibNezhad Nov 27, 2023
2703f63
update travis yml
EhsanGharibNezhad Nov 27, 2023
48b0475
update travis yml
EhsanGharibNezhad Nov 27, 2023
427933c
update travis yml
EhsanGharibNezhad Nov 27, 2023
aab99d9
update travis yml
EhsanGharibNezhad Nov 27, 2023
8dfe6ed
update travis yml
EhsanGharibNezhad Nov 27, 2023
3e11404
update travis yml
EhsanGharibNezhad Nov 27, 2023
dd6bde9
update travis yml
EhsanGharibNezhad Nov 27, 2023
380cbf7
update travis yml
EhsanGharibNezhad Nov 27, 2023
d1be54d
update travis yml
EhsanGharibNezhad Nov 27, 2023
ba824ec
update travis yml
EhsanGharibNezhad Nov 27, 2023
525d078
update travis yml
EhsanGharibNezhad Nov 27, 2023
05559a1
update travis yml
EhsanGharibNezhad Nov 27, 2023
8be0634
update travis yml
EhsanGharibNezhad Nov 27, 2023
b3ab1c9
update travis yml
EhsanGharibNezhad Nov 27, 2023
d73ab78
update travis yml
EhsanGharibNezhad Nov 27, 2023
14acfb6
update travis yml
EhsanGharibNezhad Nov 27, 2023
2d14df7
update travis yml
EhsanGharibNezhad Nov 28, 2023
03274ec
update contribution
EhsanGharibNezhad Nov 28, 2023
90ed1c2
readme
EhsanGharibNezhad Nov 28, 2023
1a49ead
readme
EhsanGharibNezhad Nov 28, 2023
a25bc2b
readme
EhsanGharibNezhad Nov 28, 2023
16edcaf
readme
EhsanGharibNezhad Nov 28, 2023
0e85653
readme
EhsanGharibNezhad Nov 28, 2023
d817804
update readme and __init__.py
EhsanGharibNezhad Nov 28, 2023
99e3197
TelescopeML/__version__.txt -> TelescopeML/__version__.py
EhsanGharibNezhad Nov 28, 2023
037d4b3
version
EhsanGharibNezhad Nov 28, 2023
e745162
update new version 0.0.3
EhsanGharibNezhad Nov 28, 2023
917eb6d
update setup.py
EhsanGharibNezhad Nov 28, 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
72 changes: 72 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"files": [
"README.md"
],
"imageSize": 100,
"commit": false,
"commitConvention": "angular",
"contributors": [
{
"login": "ehsangharibnezhad",
"name": "Ehsan Gharib-Nezhad",
"avatar_url": "https://avatars.githubusercontent.com/u/22139918?v=4",
"profile": "https://github.com/EhsanGharibNezhad",
"contributions": [
"code",
"mentoring",
"maintenance"
]
},
{
"login": "natashabatalha",
"name": "Natasha Batalha",
"avatar_url": "https://avatars.githubusercontent.com/u/6554465?v=4",
"profile": "http://natashabatalha.github.io",
"contributions": [
"ideas",
"research",
"bug"
]
},
{
"login": "hvalizad",
"name": "Hamed Valizadegan",
"avatar_url": "https://avatars.githubusercontent.com/u/52180694?v=4",
"profile": "https://github.com/hvalizad",
"contributions": [
"ideas",
"research",
]
},
{
"login": "migmartinho",
"name": "Miguel Martinho",
"avatar_url": "https://avatars.githubusercontent.com/u/47117139?v=4",
"profile": "https://github.com/migmartinho",
"contributions": [
"ideas",
"research",
]
},

{
"login": "letgotopal",
"name": "Gopal Nookula",
"avatar_url": "https://avatars.githubusercontent.com/u/89670109?v=4",
"profile": "https://github.com/letgotopal",
"contributions": [
"tutorial",
"userTesting",
]
},



],
"contributorsPerLine": 5,
"skipCi": true,
"repoType": "github",
"repoHost": "https://github.com",
"projectName": "TelescopeML",
"projectOwner": "ehsangharibnezhad"
}
68 changes: 44 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,51 @@
language: python
python:
- 3.9

matrix:
# Define the build stages
jobs:
include:
- python: 3.9
- stage: "Test on Linux with Conda env and requirements.txt"
name: "Linux: Conda env and requirements.txt"
before_install:
- sudo apt-get update
- sudo apt-get install -y wget
- wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
install:
- conda create -q -n test python=3.9
- source activate test
- pip install -r requirements.txt
script:
- python setup.py develop

git:
submodules: true
- stage: "Test on Linux with Conda env and pip TelescopeML"
name: "Linux: Conda env and pip TelescopeML"
before_install:
- sudo apt-get update
- sudo apt-get install -y wget
- wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
install:
- conda create -q -n test python=3.9
- source activate test
- pip install TelescopeML
script:
- python setup.py develop

before_install:
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
else
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
fi
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
# Define additional configurations
branches:
only:
- main # Adjust to your main branch name, e.g., master

install:
- conda create --yes -n test python=$TRAVIS_PYTHON_VERSION
- source activate test
- python setup.py install
notifications:
email: false

script:
- python -c 'import TelescopeML'

after_success:
- test $TRAVIS_BRANCH = "main" && conda install conda-build && conda install anaconda-client && bash conda/conda_upload.sh
67 changes: 67 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# TelescopeML

[![PyPI - Latest Release](https://img.shields.io/pypi/v/TelescopeML.svg?logo=pypi&logoColor=white&label=PyPI)](https://pypi.python.org/pypi/TelescopeML)
[![Build Status](https://app.travis-ci.com/EhsanGharibNezhad/TelescopeML.svg?branch=main)](https://app.travis-ci.com/EhsanGharibNezhad/TelescopeML)

``TelescopeML`` is a Python package comprising a series of modules, each equipped with specialized machine learning and
statistical capabilities for conducting Convolutional Neural Networks (CNN) or Machine Learning (ML) training on
Expand Down Expand Up @@ -54,3 +56,68 @@ or simply...
- Tutorials: https://ehsangharibnezhad.github.io/TelescopeML/tutorials.html
- The code: https://ehsangharibnezhad.github.io/TelescopeML/code.html


## Contributors

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->


<table>
<tbody>
<tr>
<td align="center" valign="top" width="20%">
<a href="https://github.com/EhsanGharibNezhad">
<img src="https://avatars.githubusercontent.com/u/22139918?v=4?s=100" width="100px;" alt="Ehsan Gharib-Nezhad"/><br />
<sub><b>Ehsan Gharib-Nezhad</b></sub>
</a><br/>
<a href="https://github.com/EhsanGharibNezhad/TelescopeML/commits?author=EhsanGharibNezhad" title="Code">💻</a>
<a href="#ideas" title="Ideas, Leading ">🤔</a>
<a href="https://pypi.org/project/TelescopeML/" title="Maintenance">🚧</a>
<a href="https://ehsangharibnezhad.github.io/TelescopeML/tutorials.html" title="tutorial">📚</a>
</td>
<td align="center" valign="top" width="20%">
<a href="http://natashabatalha.github.io">
<img src="https://avatars.githubusercontent.com/u/6554465?v=4?s=100" width="100px;" alt="Natasha Batalha"/><br />
<sub><b>Natasha Batalha</b></sub>
</a><br/>
<a href="#mentoring-astro" title="mentoring">🧑‍🏫</a>
<a href="https://github.com/EhsanGharibNezhad/TelescopeML/commits?author=natashabatalha" title="bug">🐛</a>
<a href="#ideas" title="Ideas & Feedback">🤔</a>
</td>
<td align="center" valign="top" width="20%">
<a href="https://github.com/hvalizad">
<img src="https://avatars.githubusercontent.com/u/52180694?v=4?s=100" width="100px;" alt="Hamed Valizadegan"/><br />
<sub><b>Hamed Valizadegan</b></sub>
</a><br/>
<a href="#mentoring-ML" title="mentoring">🧑‍🏫</a>
<a href="#ideas" title="Ideas & Feedback">🤔</a>
</td>
<td align="center" valign="top" width="20%">
<a href="https://github.com/migmartinho">
<img src="https://avatars.githubusercontent.com/u/47117139?v=4?s=100" width="100px;" alt="Miguel Martinho"/><br />
<sub><b>Miguel Martinho</b></sub>
</a><br/>
<a href="" title="mentoring-CNNTuning-BOHB" title="Mentoring">🧑‍🏫</a>
<a href="#ideas" title="Ideas & Feedback">🤔</a>
</td>
<td align="center" valign="top" width="20%">
<a href="https://github.com/letgotopal">
<img src="https://avatars.githubusercontent.com/u/89670109?v=4?s=100" width="100px;" alt="Gopal Nookula"/><br />
<sub><b>Gopal Nookula</b></sub>
</a><br/>
<a href="https://ehsangharibnezhad.github.io/TelescopeML/tutorials.html" title="tutorial">📚</a>
</td>
</tr>
</tbody>
</table>



<!-- ALL-CONTRIBUTORS-LIST:END -->
11 changes: 4 additions & 7 deletions TelescopeML/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@

from os.path import dirname, basename, isfile, join
import glob
from .__version__ import __version__

modules = glob.glob(join(dirname(__file__), "*.py"))

__all__ = [ basename(f)[:-3] for f in modules if isfile(f) and not f.endswith('__init__.py')]

# try:
# from pkg_resources import declare_namespace
# declare_namespace(__name__)
# except ImportError:
# from pkgutil import extend_path
# __path__ = extend_path(__path__, __name__)

__version__ = "0.0.1"
# print('TelescopeML',__version__)
3 changes: 3 additions & 0 deletions TelescopeML/__version__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# %% VERSIONS
# Default/Latest/Current version
__version__ = '0.0.3'
1 change: 0 additions & 1 deletion TelescopeML/__version__.txt

This file was deleted.

15 changes: 15 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
numpy==1.26.1
bokeh
pandas
astropy
matplotlib
seaborn==0.12.2
sphinx==7.2.6
scipy==1.11.1
keras==2.14.0
tensorflow==2.14.0
jupyterlab
sphinx
spectres==2.2.0
scikit-learn==1.3.0

5 changes: 3 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[metadata]

name = TelescopeML
version = 0.0.2
version = 0.0.3
summary = Deep Convolutional Neural Networks and Machine Learning Models for Analyzing Stellar and Exoplanetary Telescope Spectra
description_file = README.md
keywords = Astronomy, Stars, Telescope, CNN, Deep Learning, Machine Learning
Expand All @@ -10,7 +11,7 @@ home_page = https://ehsangharibnezhad.github.io/TelescopeML
url = https://ehsangharibnezhad.github.io/TelescopeML
; Add this line to the classifier options if your project supports Python 3:
programming Language :: Python :: 3
classifier =
classifier =
Intended Audience :: Science/Research
License :: OSI Approved :: GNU General Public License v3.0
Operating System :: OS Independent
Expand Down
45 changes: 28 additions & 17 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,28 @@

from setuptools import setup, find_packages
import re
# from codecs import open

# read the contents of your README file
from pathlib import Path
this_directory = Path(__file__).parent

long_description = (this_directory / "README.md").read_text()
#
# with open(this_directory/"requirements.txt", "r") as fh:
# install_requires = fh.readlines()

# Read the __version__.py file
with open('TelescopeML/__version__.py', 'r') as f:
vf = f.read()

# Obtain version from read-in __version__.py file
version = re.search(r"^_*version_* = ['\"]([^'\"]*)['\"]", vf, re.M).group(1)


setup(
name='TelescopeML',
version = '0.0.2', # MAJOR.MINOR.PATCH
version = version, # MAJOR.MINOR.PATCH
description = 'An End-to-End Python Package for Interpreting Telescope Datasets through Training Machine Learning Models, Generating Statistical Reports, and Visualizing Results',
long_description = long_description,
long_description_content_type='text/markdown',
Expand All @@ -29,21 +41,20 @@
'Topic :: Software Development :: Libraries :: Python Modules'
],
packages=find_packages(exclude=('tests', 'docs')),
install_requires=[
'numpy==1.26.1',
'bokeh',
'pandas',
'astropy',
'matplotlib',
'seaborn==0.12.2',
'sphinx==7.2.6',
'scipy==1.11.1',
'keras==2.14.0',
'tensorflow==2.14.0',
'jupyterlab',
'sphinx',
'spectres==2.2.0',
'scikit-learn==1.3.0',
],
install_requires=['numpy==1.26.1',
'bokeh',
'pandas',
'astropy',
'matplotlib',
'seaborn==0.12.2',
'sphinx==7.2.6',
'scipy==1.11.1',
'keras==2.14.0',
'tensorflow==2.14.0',
'jupyterlab',
'sphinx',
'spectres==2.2.0',
'scikit-learn==1.3.0',
],
zip_safe = False,
)
1 change: 0 additions & 1 deletion version.txt

This file was deleted.