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

Prepare final subpackage release #735

Merged
merged 6 commits into from
Aug 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions core/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# eolearn.core subpackage

The main subpackage which implements basic building blocks (EOPatch, EOTask and EOWorkflow) and commonly used functionalities.
The deprecated way to install `eolearn.core`. See [migration guide](https://github.com/sentinel-hub/eo-learn/issues/733) on how to correctly install the `eo-learn` package.
mlubej marked this conversation as resolved.
Show resolved Hide resolved

For more information about the module visit [readthedocs](https://eo-learn.readthedocs.io/en/latest/reference/eolearn.core.html), or see the [module task index](https://eo-learn.readthedocs.io/en/latest/eotasks.html#core).
Installs requirements and a dummy package that is detected by `eo-learn` but otherwise does not change anything.
1 change: 1 addition & 0 deletions core/deprecated_eolearn_core/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "1.5.0"
7 changes: 2 additions & 5 deletions core/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def parse_requirements(file):


def get_version():
path = os.path.join(os.path.dirname(__file__), "eolearn", "core", "__init__.py")
path = os.path.join(os.path.dirname(__file__), "deprecated_eolearn_core", "__init__.py")
with open(path) as version_file:
for line in version_file:
if line.find("__version__") >= 0:
Expand All @@ -44,15 +44,12 @@ def get_version():
author="Sinergise EO research team",
author_email="[email protected]",
license="MIT",
packages=find_packages(exclude=["eolearn.tests*"]),
package_data={"eolearn": ["core/py.typed"]},
include_package_data=True,
packages=find_packages(),
install_requires=parse_requirements("requirements.txt"),
extras_require={
"RAY": parse_requirements("requirements-ray.txt"),
"ZARR": parse_requirements("requirements-zarr.txt"),
},
zip_safe=False,
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down
4 changes: 2 additions & 2 deletions coregistration/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# eolearn.coregistration subpackage

A collection of tools and EOTasks for image co-registration
The deprecated way to install `eolearn.coregistration`. See [migration guide](https://github.com/sentinel-hub/eo-learn/issues/733) on how to correctly install the `eo-learn` package.

For more information about the module visit [readthedocs](https://eo-learn.readthedocs.io/en/latest/reference/eolearn.coregistration.html), or see the [module task index](https://eo-learn.readthedocs.io/en/latest/eotasks.html#coregistration).
Installs requirements and a dummy package that is detected by `eo-learn` but otherwise does not change anything.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "1.5.0"
1 change: 0 additions & 1 deletion coregistration/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# using headless version of opencv, otherwise gitlab runners fail
eo-learn-core
opencv-python-headless
4 changes: 1 addition & 3 deletions coregistration/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def parse_requirements(file):


def get_version():
path = os.path.join(os.path.dirname(__file__), "eolearn", "coregistration", "__init__.py")
path = os.path.join(os.path.dirname(__file__), "deprecated_eolearn_coregistration", "__init__.py")
with open(path) as version_file:
for line in version_file:
if line.find("__version__") >= 0:
Expand All @@ -45,9 +45,7 @@ def get_version():
author_email="[email protected]",
license="MIT",
packages=find_packages(),
include_package_data=True,
install_requires=parse_requirements("requirements.txt"),
zip_safe=False,
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down
14 changes: 14 additions & 0 deletions eolearn/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,16 @@
"""Main module of the `eolearn` package."""
__version__ = "1.4.2"

import importlib.util
import warnings

SUBPACKAGES = ["core", "coregistration", "features", "geometry", "io", "mask", "ml_tools", "visualization"]
deprecated_installs = [
subpackage for subpackage in SUBPACKAGES if importlib.util.find_spec(f"deprecated_eolearn_{subpackage}") is not None
]
if deprecated_installs:
warnings.warn(
f"You are currently using an outdated installation of `eo-learn` for submodules {deprecated_installs}. You can"
" find instructions on how to install `eo-learn` correctly at"
" https://github.com/sentinel-hub/eo-learn/issues/733."
)
4 changes: 2 additions & 2 deletions features/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# eolearn.features subpackage

A collection of utilities for extracting data properties and feature manipulation.
The deprecated way to install `eolearn.features`. See [migration guide](https://github.com/sentinel-hub/eo-learn/issues/733) on how to correctly install the `eo-learn` package.

For more information about the module visit [readthedocs](https://eo-learn.readthedocs.io/en/latest/reference/eolearn.features.html), or see the [module task index](https://eo-learn.readthedocs.io/en/latest/eotasks.html#features).
Installs requirements and a dummy package that is detected by `eo-learn` but otherwise does not change anything.
1 change: 1 addition & 0 deletions features/deprecated_eolearn_features/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "1.5.0"
1 change: 0 additions & 1 deletion features/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
eo-learn-core
numba>=0.53.0
numpy
pillow>=9.1.0
Expand Down
4 changes: 1 addition & 3 deletions features/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def parse_requirements(file):


def get_version():
path = os.path.join(os.path.dirname(__file__), "eolearn", "features", "__init__.py")
path = os.path.join(os.path.dirname(__file__), "deprecated_eolearn_features", "__init__.py")
with open(path) as version_file:
for line in version_file:
if line.find("__version__") >= 0:
Expand All @@ -45,9 +45,7 @@ def get_version():
author_email="[email protected]",
license="MIT",
packages=find_packages(),
include_package_data=True,
install_requires=parse_requirements("requirements.txt"),
zip_safe=False,
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down
4 changes: 2 additions & 2 deletions geometry/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# eolearn.geometry subpackage

Geometry subpackage used for geometric transformation and conversion between vector and raster data.
The deprecated way to install `eolearn.geometry`. See [migration guide](https://github.com/sentinel-hub/eo-learn/issues/733) on how to correctly install the `eo-learn` package.

For more information about the module visit [readthedocs](https://eo-learn.readthedocs.io/en/latest/reference/eolearn.geometry.html), or see the [module task index](https://eo-learn.readthedocs.io/en/latest/eotasks.html#geometry).
Installs requirements and a dummy package that is detected by `eo-learn` but otherwise does not change anything.
1 change: 1 addition & 0 deletions geometry/deprecated_eolearn_geometry/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "1.5.0"
1 change: 0 additions & 1 deletion geometry/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
eo-learn-core
geopandas>=0.8.1
rasterio>=1.2.7
scikit-image>=0.15.0
Expand Down
4 changes: 1 addition & 3 deletions geometry/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def parse_requirements(file):


def get_version():
path = os.path.join(os.path.dirname(__file__), "eolearn", "geometry", "__init__.py")
path = os.path.join(os.path.dirname(__file__), "deprecated_eolearn_geometry", "__init__.py")
with open(path) as version_file:
for line in version_file:
if line.find("__version__") >= 0:
Expand All @@ -45,9 +45,7 @@ def get_version():
author_email="[email protected]",
license="MIT",
packages=find_packages(),
include_package_data=True,
install_requires=parse_requirements("requirements.txt"),
zip_safe=False,
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down
4 changes: 2 additions & 2 deletions io/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# eolearn.io subpackage

Input/output subpackage that deals with obtaining data from Sentinel Hub services or saving and loading data locally.
The deprecated way to install `eolearn.io`. See [migration guide](https://github.com/sentinel-hub/eo-learn/issues/733) on how to correctly install the `eo-learn` package.

For more information about the module visit [readthedocs](https://eo-learn.readthedocs.io/en/latest/reference/eolearn.io.html), or see the [module task index](https://eo-learn.readthedocs.io/en/latest/eotasks.html#io).
Installs requirements and a dummy package that is detected by `eo-learn` but otherwise does not change anything.
1 change: 1 addition & 0 deletions io/deprecated_eolearn_io/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "1.5.0"
1 change: 0 additions & 1 deletion io/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
affine
boto3
eo-learn-core
fiona>=1.8.18
geopandas>=0.8.1
rasterio>=1.2.7
Expand Down
4 changes: 1 addition & 3 deletions io/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def parse_requirements(file):


def get_version():
path = os.path.join(os.path.dirname(__file__), "eolearn", "io", "__init__.py")
path = os.path.join(os.path.dirname(__file__), "deprecated_eolearn_io", "__init__.py")
with open(path) as version_file:
for line in version_file:
if line.find("__version__") >= 0:
Expand All @@ -45,10 +45,8 @@ def get_version():
author_email="[email protected]",
license="MIT",
packages=find_packages(),
include_package_data=True,
install_requires=parse_requirements("requirements.txt"),
extras_require={"METEOBLUE": parse_requirements("requirements-meteoblue.txt")},
zip_safe=False,
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down
4 changes: 2 additions & 2 deletions mask/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# eolearn.mask subpackage

The subpackage is used for masking of data and calculation of cloud masks.
The deprecated way to install `eolearn.mask`. See [migration guide](https://github.com/sentinel-hub/eo-learn/issues/733) on how to correctly install the `eo-learn` package.

For more information about the module visit [readthedocs](https://eo-learn.readthedocs.io/en/latest/reference/eolearn.mask.html), or see the [module task index](https://eo-learn.readthedocs.io/en/latest/eotasks.html#mask).
Installs requirements and a dummy package that is detected by `eo-learn` but otherwise does not change anything.
1 change: 1 addition & 0 deletions mask/deprecated_eolearn_mask/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "1.5.0"
1 change: 0 additions & 1 deletion mask/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# using headless version of opencv, otherwise gitlab runners fail
eo-learn-core
lightgbm>=2.0.11, <4
numpy
opencv-python-headless
Expand Down
10 changes: 1 addition & 9 deletions mask/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def parse_requirements(file):


def get_version():
path = os.path.join(os.path.dirname(__file__), "eolearn", "mask", "__init__.py")
path = os.path.join(os.path.dirname(__file__), "deprecated_eolearn_mask", "__init__.py")
with open(path) as version_file:
for line in version_file:
if line.find("__version__") >= 0:
Expand All @@ -45,15 +45,7 @@ def get_version():
author_email="[email protected]",
license="MIT",
packages=find_packages(),
include_package_data=True,
package_data={
"eolearn.mask": [
"models/pixel_s2_cloud_detector_lightGBM_v0.2.txt",
"models/ssim_s2_cloud_detector_lightGBM_v0.2.txt",
]
},
install_requires=parse_requirements("requirements.txt"),
zip_safe=False,
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down
5 changes: 0 additions & 5 deletions ml_tools/MANIFEST.in

This file was deleted.

4 changes: 2 additions & 2 deletions ml_tools/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# eolearn.ml_tools subpackage

Various tools that can be used before or after the machine learning process.
The deprecated way to install `eolearn.ml_tools`. See [migration guide](https://github.com/sentinel-hub/eo-learn/issues/733) on how to correctly install the `eo-learn` package.

For more information about the module visit [readthedocs](https://eo-learn.readthedocs.io/en/latest/reference/eolearn.ml-tools.html), or see the [module task index](https://eo-learn.readthedocs.io/en/latest/eotasks.html#ml-tools).
Installs requirements and a dummy package that is detected by `eo-learn` but otherwise does not change anything.
1 change: 1 addition & 0 deletions ml_tools/deprecated_eolearn_ml_tools/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "1.5.0"
1 change: 0 additions & 1 deletion ml_tools/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
eo-learn-core
numpy
shapely
4 changes: 1 addition & 3 deletions ml_tools/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def parse_requirements(file):


def get_version():
path = os.path.join(os.path.dirname(__file__), "eolearn", "ml_tools", "__init__.py")
path = os.path.join(os.path.dirname(__file__), "deprecated_eolearn_ml_tools", "__init__.py")
with open(path) as version_file:
for line in version_file:
if line.find("__version__") >= 0:
Expand All @@ -45,13 +45,11 @@ def get_version():
author_email="[email protected]",
license="MIT",
packages=find_packages(),
include_package_data=True,
install_requires=parse_requirements("requirements.txt"),
extras_require={
"PLOTTING": parse_requirements("requirements-plotting.txt"),
"TDIGEST": parse_requirements("requirements-tdigest.txt"),
},
zip_safe=False,
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down
4 changes: 2 additions & 2 deletions visualization/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# eolearn.visualization subpackage

A collection of data visualization utilities.
The deprecated way to install `eolearn.visualization`. See [migration guide](https://github.com/sentinel-hub/eo-learn/issues/733) on how to correctly install the `eo-learn` package.

For more information about the module visit [readthedocs](https://eo-learn.readthedocs.io/en/latest/reference/eolearn.visualization.html).
Installs requirements and a dummy package that is detected by `eo-learn` but otherwise does not change anything.
1 change: 1 addition & 0 deletions visualization/deprecated_eolearn_visualization/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "1.5.0"
1 change: 0 additions & 1 deletion visualization/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
eo-learn-core
graphviz>=0.10.1
jinja2
matplotlib
Expand Down
4 changes: 1 addition & 3 deletions visualization/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def parse_requirements(file):


def get_version():
path = os.path.join(os.path.dirname(__file__), "eolearn", "visualization", "__init__.py")
path = os.path.join(os.path.dirname(__file__), "deprecated_eolearn_visualization", "__init__.py")
with open(path) as version_file:
for line in version_file:
if line.find("__version__") >= 0:
Expand Down Expand Up @@ -46,9 +46,7 @@ def get_version():
license="MIT",
packages=find_packages(),
package_data={"eolearn": ["visualization/report_templates/report.html"]},
include_package_data=True,
install_requires=parse_requirements("requirements.txt"),
zip_safe=False,
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down