Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

Commit 381f648

Browse files
authored
Merge pull request #1 from CS-SI/develop
v0.2
2 parents 584c4bd + 1f616b6 commit 381f648

File tree

16 files changed

+614
-232
lines changed

16 files changed

+614
-232
lines changed

.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@ tab_width=4
2727
[{*.yaml,*.yml}]
2828
indent_style=space
2929
indent_size=2
30-
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**Code To Reproduce**
14+
CLI commands or Python code snippet to reproduce the bug. Please use maximum verbosity using:
15+
```sh
16+
eodag -vvv [OPTIONS] COMMAND [ARGS]...
17+
```
18+
or
19+
```py
20+
from eodag.utils.logging import setup_logging
21+
setup_logging(verbose=3)
22+
```
23+
24+
**Output**
25+
Compete output obtained with maximal verbosity.
26+
27+
**Environment:**
28+
- Python version: `python --version`
29+
- EODAG version: `eodag version`
30+
- eodag-sentinelsat version
31+
32+
**Additional context**
33+
Add any other context about the bug here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: enhancement
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context about the feature request here.

.github/workflows/deploy.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Publish to PyPI
2+
3+
on:
4+
push:
5+
tags:
6+
- "v*"
7+
workflow_dispatch:
8+
9+
jobs:
10+
build-n-publish:
11+
name: Build and publish to PyPI
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout source
16+
uses: actions/checkout@v2
17+
18+
- name: Set up Python 3.7
19+
uses: actions/setup-python@v2
20+
with:
21+
python-version: "3.7"
22+
23+
- name: Check that the current version isn't already on PyPi
24+
run: |
25+
if [ "$(./get_pypi_latest_version.sh)" != "$(python setup.py --version)" ]
26+
then
27+
echo "Current version is not on PyPI, proceed with bulding"
28+
else
29+
echo "Current version is the latest version uploaded to PyPI"
30+
exit 1
31+
fi
32+
33+
- name: Check long description is OK for PyPI with tox
34+
run: |
35+
python -m pip install --upgrade pip
36+
python -m pip install tox sphinx
37+
tox -e pypi
38+
39+
- name: Build a binary wheel and a source tarball
40+
run: |
41+
python -m pip install setuptools wheel
42+
python setup.py sdist bdist_wheel
43+
- name: Publish distribution to PyPI
44+
uses: pypa/gh-action-pypi-publish@release/v1
45+
with:
46+
user: __token__
47+
password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/test.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Run Tests
2+
3+
on:
4+
push:
5+
branches: [master, develop]
6+
pull_request:
7+
branches: [master, develop]
8+
workflow_dispatch:
9+
10+
jobs:
11+
lint:
12+
name: Linting (pre-commit)
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout the repo
16+
uses: actions/checkout@v2
17+
- name: Set up Python 3.7
18+
uses: actions/setup-python@v2
19+
with:
20+
python-version: "3.7"
21+
- name: Run pre-commit action
22+
uses: pre-commit/action@v2.0.0
23+
24+
check-pypi:
25+
name: Long description check for PyPI
26+
runs-on: ubuntu-latest
27+
steps:
28+
- name: Checkout the repo
29+
uses: actions/checkout@v2
30+
- name: Set up Python 3.7
31+
uses: actions/setup-python@v2
32+
with:
33+
python-version: "3.7"
34+
- name: Update pip
35+
run: python -m pip install --upgrade pip
36+
- name: Get pip cache dir
37+
id: pip-cache
38+
run: |
39+
echo "::set-output name=dir::$(pip cache dir)"
40+
- name: Get current week number
41+
id: get-week
42+
shell: bash
43+
run: echo "::set-output name=week::$(date +'%V')"
44+
- name: Pip cache
45+
uses: actions/cache@v2
46+
with:
47+
path: ${{ steps.pip-cache.outputs.dir }}
48+
key: ${{ runner.os }}-pip-${{ steps.get-week.outputs.week }}-${{ hashFiles('setup.py') }}
49+
- name: Install tox and sphinx (to have rst2html.py utility available)
50+
run: |
51+
python -m pip install tox sphinx
52+
- name: Testing with tox
53+
run: python -m tox -e pypi

.gitignore

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ pip-log.txt
3535
pip-delete-this-directory.txt
3636

3737
# Unit test / coverage reports
38+
cover
3839
htmlcov/
3940
.tox/
4041
.coverage
@@ -44,6 +45,8 @@ nosetests.xml
4445
coverage.xml
4546
*,cover
4647
.hypothesis/
48+
test-reports
49+
.pytest_cache/
4750

4851
# Translations
4952
*.mo
@@ -90,7 +93,19 @@ ENV/
9093
.ropeproject
9194

9295
# All kind of user files (mostly configuration files with passwords)
93-
*/*.user*
94-
*.user*
95-
96-
.idea/*
96+
*.user.yml*
97+
docs/tutorials/eodag_workspace/search_results.geojson
98+
docs/tutorials/eodag_workspace/.downloaded
99+
examples/eodag_workspace
100+
tests/resources/user_conf.yml
101+
search_results.geojson
102+
103+
# IDE
104+
# Pycharm
105+
.idea/*
106+
# VSCode
107+
.vscode
108+
# Eclipse/PyDev
109+
.project
110+
.pydevproject
111+
.settings/

.pre-commit-config.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
exclude: '^$'
2+
fail_fast: false
3+
repos:
4+
5+
- repo: https://github.com/pre-commit/pre-commit-hooks.git
6+
rev: v3.4.0
7+
hooks:
8+
- id: trailing-whitespace
9+
- id: end-of-file-fixer
10+
- id: check-docstring-first
11+
- id: check-json
12+
- id: check-yaml
13+
args: [--allow-multiple-documents, --unsafe]
14+
- id: check-xml
15+
- id: check-added-large-files
16+
args: ['--maxkb=1600']
17+
- id: debug-statements
18+
- id: check-merge-conflict
19+
20+
- repo: 'https://gitlab.com/pycqa/flake8'
21+
rev: 3.9.0
22+
hooks:
23+
- id: flake8
24+
25+
- repo: 'https://github.com/ambv/black'
26+
rev: 20.8b1
27+
hooks:
28+
- id: black
29+
args: ['--safe']
30+
31+
- repo: 'https://github.com/chewse/pre-commit-mirrors-pydocstyle'
32+
rev: v2.1.1
33+
hooks:
34+
- id: pydocstyle
35+
36+
- repo: https://github.com/pre-commit/mirrors-isort
37+
rev: v5.7.0
38+
hooks:
39+
- id: isort

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,4 @@ into proprietary programs. If your program is a subroutine library, you
671671
may consider it more useful to permit linking proprietary applications with
672672
the library. If this is what you want to do, use the GNU Lesser General
673673
Public License instead of this License. But first, please read
674-
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
674+
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
include LICENSE
22
include NOTICE
3-
include README.rst
3+
include README.rst

NOTICE

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
eodag-sentinelsat Copyright 2018, CS Systèmes d'Information, http://www.c-s.fr
1+
eodag-sentinelsat Copyright 2021, CS GROUP - France, http://www.c-s.fr
22

33
This software is distributed under the GNU General Public License v3,
44
see LICENSE file or https://www.gnu.org/licenses/gpl.html for details.
@@ -8,20 +8,8 @@ This software includes code from the sentinelsat project.
88
sentinelsat is released under The GNU General Public License v3 (GPLv3):
99
https://www.gnu.org/licenses/gpl.html
1010

11-
This software includes code from the tqdm project.
12-
Copyright (c) 2013 noamraph
13-
https://github.com/tqdm/tqdm
14-
tqdm is released under the MIT license:
15-
http://www.opensource.org/licenses/mit-license.php
16-
17-
This software includes code from the Shapely project.
18-
Copyright (c) 2007, Sean C. Gillies
19-
https://github.com/Toblerity/Shapely
20-
Shapely is released under the BSD 3 clause license:
21-
https://opensource.org/licenses/BSD-3-Clause
22-
2311
In "standalone" mode, this software includes code from the EODAG project.
24-
Copyright 2018, CS Systemes d'Information, http://www.c-s.fr
25-
https://bitbucket.org/geostorm/eodag
12+
Copyright 2021, CS GROUP - France, http://www.c-s.fr
13+
https://github.com/CS-SI/eodag
2614
EODAG is released under the Apache Software License (ASL) 2.0.
2715
http://www.apache.org/licenses/LICENSE-2.0

0 commit comments

Comments
 (0)