Skip to content

Commit

Permalink
Merge pull request #2 from Serapieum-of-alex/migrate-to-conda
Browse files Browse the repository at this point in the history
Migrate to conda
  • Loading branch information
MAfarrag committed Dec 26, 2022
2 parents 405055f + 2238b60 commit edbd5c2
Show file tree
Hide file tree
Showing 41 changed files with 10,462 additions and 591 deletions.
1 change: 0 additions & 1 deletion .coveralls.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
repo_token: hxJrvjqiH2xBI7eit7BAb7FidH0LeYpGq
service_name: github-action

28 changes: 12 additions & 16 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
- Please include a summary of the change and which issue is fixed.
- Please also include relevant motivation and context.
- List any dependencies that are required for this change.

Fixes # (issue)

- Fixes # (issue)
## Type of change

Please delete options that are not relevant.
Check relevant points.

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
Expand All @@ -15,24 +17,18 @@ Please delete options that are not relevant.

# How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
- Please describe the tests that you ran to verify your changes.
- Provide instructions so we can reproduce.
- Please also list any relevant details for your test configuration

- [ ] Test A
- [ ] Test B

**Test Configuration**:
* Firmware version:
* Hardware:
* Toolchain:
* SDK:

# Checklist:

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] updated version number in setup.py/pyproject.toml
- [ ] updated environment.yml and the lock file
- [ ] added changes to History.rst
- [ ] updated the latest version in README file
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream modules
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ jobs:
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
Expand All @@ -61,7 +61,7 @@ jobs:
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ jobs:
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./coverage1.xml,./coverage2.xml
directory: ./coverage/reports/
directory: ./coverage/reports/
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,8 @@ build_artifacts
.idea/.gitignore
.idea
mo_*
conda/
conda/
/examples/data/ecmwf/daily/*
.idea/*
examples/data/chirps/*
*.xml
98 changes: 53 additions & 45 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
hooks:
# - id: check-yaml
# name: "[yaml - check] validate yaml"
- id: end-of-file-fixer
name: "[py - check] validate yaml"
- id: trailing-whitespace
name: "[file - format] trim trailing whitespace"
args: [ --markdown-linebreak-ext=md ]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
hooks:
- id: end-of-file-fixer
name: "[py - check] validate yaml"
- id: trailing-whitespace
name: "[file - format] trim trailing whitespace"
args: [ --markdown-linebreak-ext=md ]
- id: check-added-large-files
name: "[file - check] large file"
args: [ --maxkb=5000 ]
Expand Down Expand Up @@ -37,41 +35,51 @@ repos:
--no-sort-keys ]
- id: requirements-txt-fixer
name: "[reqs - format] fix requirements.txt"
- id: check-yaml
name: "[yaml - check] validate yaml"
- repo: https://github.com/PyCQA/docformatter
rev: v1.4
hooks:
- id: docformatter
name: "[py - format] docformatter"
args: [ -i, --wrap-summaries, "0" ]

# - repo: https://github.com/PyCQA/docformatter
# rev: v1.4
# hooks:
# - id: docformatter
## name: "[py - format] docformatter"
## args: [ -i, --wrap-summaries, "0" ]
- repo: https://github.com/PyCQA/pydocstyle
rev: 6.1.1
hooks:
- id: pydocstyle
name: "[py - check] pydocstyle"
files: ^Hapi/

# - repo: https://github.com/PyCQA/pydocstyle
# rev: 6.1.1
# hooks:
# - id: pydocstyle
# name: "[py - check] pydocstyle"
# files: ^Hapi/
# TODO : uncheck later and fix all the problems of line too long
#- repo: https://gitlab.com/pycqa/flake8
# rev: 3.8.4
# hooks:
# - id: flake8
# name: "[py - check] flake8"
# language_version: python3.8
# TODO : this hook does not fix the files
#- repo: https://github.com/psf/black
# rev: 19.3b0
# hooks:
# - id: black
- repo: https://github.com/pre-commit/mirrors-isort
rev: v5.7.0
hooks:
- id: isort
name: "[py - format] isort"
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.4
hooks:
- id: flake8
name: "[py - check] flake8"
language_version: python3.9
exclude: ^(examples/|tests/)

#- repo: https://github.com/ambv/black
# rev: 20.8b1
# hooks:
# - id: black
# name: "[py - format] black"
# language_version: python3.8
- repo: https://github.com/psf/black
rev: 22.8.0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-isort
rev: v5.7.0
hooks:
- id: isort
name: "[py - format] isort"
- repo: https://github.com/ambv/black
rev: 22.8.0
hooks:
- id: black
name: "[py - format] black"
language_version: python3.9

- repo: local
hooks:
- id: pytest-check
name: pytest-check
entry: pytest
language: system
pass_filenames: false
always_run: true
8 changes: 7 additions & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@
History
=======

0.1.0 (2022-05-24)
0.1.5 (2022-12-07) : add ECMWF data catalog
------------------

* First release on PyPI.

0.1.6 (2022-12-26) :
------------------

* Use environment.yaml and requirements.txt instead of pyproject.toml and replace poetry env byconda env
* lock numpy to 1.23.5
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ earthobserve

Main Features
-------------
-
- ERA Interim Download
- CHIRPS Rainfall data Download


Future work
-------------
-
- Google earth engine
- ERA 5



Expand Down Expand Up @@ -58,7 +60,7 @@ pip install git+https://github.com/MAfarrag/earthobserve
## pip
to install the last release you can easly use pip
```
pip install earthobserve==0.1.0
pip install earthobserve==0.1.6
```

Quick start
Expand Down
4 changes: 2 additions & 2 deletions clone.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"message": "Must have push access to repository",
"documentation_url": "https://docs.github.com/rest/reference/repos#get-repository-clones"
"message": "Must have push access to repository",
"documentation_url": "https://docs.github.com/rest/reference/repos#get-repository-clones"
}
Loading

0 comments on commit edbd5c2

Please sign in to comment.