Skip to content

Commit

Permalink
mundialis->actinia-org (#471)
Browse files Browse the repository at this point in the history
Co-authored-by: Markus Neteler <[email protected]>
  • Loading branch information
mmacata and neteler authored Sep 2, 2023
1 parent 2b1eb40 commit 8877b7c
Show file tree
Hide file tree
Showing 15 changed files with 144 additions and 145 deletions.
222 changes: 111 additions & 111 deletions CHANGELOG.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ as a support forum. Your question is much more likely to be answered by develope

## Adding bug reports

Bug reports are handled in the [issue tracker](https://github.com/mundialis/actinia_core/issues)
Bug reports are handled in the [issue tracker](https://github.com/actinia-org/actinia-core/issues)
on actinia's home on GitHub. Writing a good bug report is not easy. But fixing a poorly
documented bug is not easy either, so please put in the effort it takes to create a
thorough bug report.
Expand All @@ -69,7 +69,7 @@ definitely a problem with actinia.
## Feature requests

Got an idea for a new feature in actinia? Submit a thorough description of the new
feature in the [issue tracker](https://github.com/mundialis/actinia_core/issues). Please
feature in the [issue tracker](https://github.com/actinia-org/actinia-core/issues). Please
include any technical documents that can help the developer make the new feature a
reality. An example of this could be a publicly available academic paper that
describes a new geoprocessing method. Also, including a numerical test case will make it
Expand All @@ -83,7 +83,7 @@ Note that not all feature requests are accepted.
actinia is in dire need of better documentation. Any contributions of documentation
are greatly appreciated. The actinia documentation is available on
[actinia.mundialis.de](https://actinia.mundialis.de/).
Contributions to the documentation should be made as [Pull Requests](https://github.com/mundialis/actinia_core/pulls)
Contributions to the documentation should be made as [Pull Requests](https://github.com/actinia-org/actinia-core/pulls)
on GitHub.

## Code contributions
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The full API documentation is available [here](https://redocly.github.io/redoc/?
## actinia command execution - actinia shell

There is also an option to interactively control actinia. For details,
see [here](https://github.com/mundialis/actinia_core/tree/main/scripts).
see [here](https://github.com/actinia-org/ace).

## Installation

Expand Down
17 changes: 8 additions & 9 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ curl http://127.0.0.1:8088/api/v3/version
* Want to __start developing__? Look for [Local dev-setup with docker](#local-dev-setup) below.
* For __production deployment__, see [Production deployment](#production-deployment) below.

On startup, some GRASS GIS locations are created by default but they are still empty. How to get some geodata to start processing, see in [Testing GRASS GIS inside a container](#grass-gis) below.
On startup, some GRASS GIS locations are created by default but they are still empty. How to get some geodata to start processing, see in [Testing GRASS GIS inside a container](#grass-gis) below.


<a id="latest-grass-gis></a>
<a id="latest-grass-gis"></a>
## Installation with most recent GRASS GIS version

The actinia Dockerimage is based on the latest stable releasebranch of GRASS GIS. To use actinia with the latest GRASS GIS development version, do the following:
Expand All @@ -40,7 +39,6 @@ Change the line
```
and run `docker-compose -f docker/docker-compose.yml up`


<a id="startup-errors"></a>
# How to fix common startup errors
* if a redis db is running locally this will fail. Run and try again:
Expand All @@ -53,7 +51,6 @@ sudo sysctl -w vm.max_map_count=262144
```
this is only valid on runtime. To change permanently, set vm.max_map_count in /etc/sysctl.conf


<a id="local-dev-setup"></a>
# Local dev-setup with docker

Expand Down Expand Up @@ -81,7 +78,7 @@ python3 setup.py install
gunicorn -b 0.0.0.0:8088 -w 1 --access-logfile=- -k gthread actinia_core.main:flask_app
```
To test your local changes, you best use the Test Dockerimage:
To test your local changes, you best use the test Dockerimage:
```
# changing directory is necessary to have the correct build context
(cd .. && docker build -f docker/actinia-core-tests/Dockerfile -t actinia-test .)
Expand All @@ -93,8 +90,8 @@ To lint your local changes, run
(cd ../src && flake8 --config=../.flake8 --count --statistics --show-source --jobs=$(nproc) .)
```


## Local dev-setup with redis queue

- change queue type to redis in `docker/actinia-core-dev/actinia.cfg`
- start one actinia-core instance (the job receiver) as usual, eg. with vscode
- open actinia-core on the command line and run
Expand All @@ -107,6 +104,7 @@ To lint your local changes, run
```
## Local dev-setup with configured endpoints
- add an endpoints configuration csv file like `docker/actinia-core-dev/endpoints.csv`
with all desired endpoints including method:
```
Expand Down Expand Up @@ -136,21 +134,22 @@ grass /actinia_core/grassdb/nc_spm_08/PERMANENT --exec r.univar -g elevation
grass /actinia_core/grassdb/nc_spm_08/PERMANENT --exec v.random output=myrandom n=42
grass /actinia_core/grassdb/nc_spm_08/PERMANENT --exec v.info -g myrandom
```
You now have some data which you can access through actinia. To get information
via API, start actinia with gunicorn and run
```
curl -u actinia-gdi:actinia-gdi http://127.0.0.1:8088/api/v3/locations/nc_spm_08/mapsets
```
The folder where you downloaded the data into (`/actinia_core/grassdb`) is mounted into your docker container via the compose file, so all data is kept, even if your docker container restarts.
If you want to download the data not from inside the container but from your normal system, download https://grass.osgeo.org/sampledata/north_carolina/nc_spm_08_grass7.tar.gz, extract it and place it into actinia-core/docker/actinia-core-data/grassdb/
If you want to download the data not from inside the container but from your normal system, download <https://grass.osgeo.org/sampledata/north_carolina/nc_spm_08_grass7.tar.gz>, extract it and place it into `actinia-core/docker/actinia-core-data/grassdb/`.
<a id="production-deployment"></a>
# Production and Cloud deployment
To run actinia-core in production systems, best with multiple actinia-core instances, find more detailed information in the dedicated [actinia-docker](https://github.com/actinia-org/actinia-docker) repository.
# Building the API documentation
To build the apidocs, run
Expand Down
2 changes: 1 addition & 1 deletion docker/actinia-core-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN grass --tmp-location EPSG:4326 --exec g.extension -s \
WORKDIR /build
ARG WHEEL_NAME=actinia_api-${ACTINIA_API_VERSION}-py3-none-any.whl
RUN curl -L --output /build/${WHEEL_NAME} \
https://github.com/mundialis/actinia-api/releases/download/${ACTINIA_API_VERSION}/${WHEEL_NAME}
https://github.com/actinia-org/actinia-api/releases/download/${ACTINIA_API_VERSION}/${WHEEL_NAME}

# Install actinia-core and libs
COPY --from=build /build/*.whl /build/
Expand Down
2 changes: 1 addition & 1 deletion docker/actinia-core-tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN wget --quiet https://grass.osgeo.org/sampledata/north_carolina/nc_spm_mapset
RUN chown -R 1001:1001 /actinia_core/grassdb/nc_spm_08/modis_lst && chmod -R g+w /actinia_core/grassdb/nc_spm_08/modis_lst

# install actinia-api
RUN pip3 install actinia-api@https://github.com/mundialis/actinia-api/releases/download/${ACTINIA_API_VERSION}/actinia_api-${ACTINIA_API_VERSION}-py3-none-any.whl
RUN pip3 install actinia-api@https://github.com/actinia-org/actinia-api/releases/download/${ACTINIA_API_VERSION}/actinia_api-${ACTINIA_API_VERSION}-py3-none-any.whl

# install GRASS addons required for tests
RUN grass --tmp-location EPSG:4326 --exec g.extension -s extension=r.colors.out_sld
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/authors.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
See

https://github.com/mundialis/actinia_core/graphs/contributors
https://github.com/actinia-org/actinia-core/graphs/contributors
2 changes: 1 addition & 1 deletion docs/docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
See:

https://github.com/mundialis/actinia_core/blob/main/CHANGELOG.md
https://github.com/actinia-org/actinia-core/blob/main/CHANGELOG.md
2 changes: 1 addition & 1 deletion docs/docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ephemeral databases. The computational results of ephemeral processing
are available via object storage as GeoTIFF files.

The full API documentation is available here: <https://redocly.github.io/redoc/?url=https://actinia.mundialis.de/latest/swagger.json>.
The source code is available here: <https://github.com/mundialis/actinia_core>.
The source code is available here: <https://github.com/actinia-org/actinia-core>.

* Introduction
* What is REST?
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ mkdir -p $HOME/actinia/workspace/tmp

cd /tmp

git clone https://github.com/mundialis/actinia_core.git actinia_core
git clone https://github.com/actinia-org/actinia-core.git actinia_core
cd actinia_core
pip install -r requirements.txt
python setup.py install
Expand All @@ -160,7 +160,7 @@ mkdir -p $HOME/actinia/workspace/tmp

cd /tmp

git clone https://github.com/mundialis/actinia-api.git actinia-api
git clone https://github.com/actinia-org/actinia-api.git actinia-api
cd actinia-api
python setup.py install
```
Expand Down
2 changes: 1 addition & 1 deletion logging.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The `log_interface`s `fluentd` and `stdout` are mutually exclusive, while actini
log to file with configured formatter and log level `CRITICAL`.

For more information, see
https://github.com/mundialis/actinia_core/blob/main/src/actinia_core/resources/common/config.py#L132.
https://github.com/actinia-org/actinia-core/blob/main/src/actinia_core/resources/common/config.py#L132.


### Dev / Debug Hints
Expand Down
2 changes: 1 addition & 1 deletion requirements_ubuntu19.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ rasterio==1.2.10
uWSGI>=2.0.17
wheel

actinia-api@https://github.com/mundialis/actinia-api/releases/download/2.0.0/actinia_api-2.0.0-py3-none-any.whl
actinia-api@https://github.com/actinia-org/actinia-api/releases/download/2.0.0/actinia_api-2.0.0-py3-none-any.whl

# currently break things - TODO - needed?
# pkg-resources==0.0.0
Expand Down
6 changes: 3 additions & 3 deletions scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ To be run in a GRASS GIS session:

```bash
# actinia importer installation
g.extension extension=importer url=https://github.com/mundialis/importer
g.extension extension=importer url=https://github.com/actinia-org/importer

# actinia exporter installation
g.extension extension=exporter url=https://github.com/mundialis/exporter
g.extension extension=exporter url=https://github.com/actinia-org/exporter

# ace (actinia command execution) tool
g.extension extension=ace url=https://github.com/mundialis/ace
g.extension extension=ace url=https://github.com/actinia-org/ace
```

### Authentication settings
Expand Down
16 changes: 8 additions & 8 deletions src/actinia_core/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
The module structure is currently under rework. See [according github issue](https://github.com/mundialis/actinia_core/issues/190) and [plugin dependencies](https://github.com/mundialis/actinia_core/pull/221) for more details.
The module structure is currently under rework. See [according github issue](https://github.com/actinia-org/actinia-core/issues/190) and [plugin dependencies](https://github.com/actinia-org/actinia-core/pull/221) for more details.

This README should support restructuring and identify dependencies outside of this repository.
This mainly concerns the plugins:
* [actinia-module-plugin](https://github.com/mundialis/actinia-module-plugin) (amp)
* [actinia_statistic_plugin](https://github.com/mundialis/actinia_statistic_plugin) (statistic)
* [actinia_satallite_plugin](https://github.com/mundialis/actinia_satellite_plugin) (satellite)
* [actinia-metadata-plugin](https://github.com/mundialis/actinia-metadata-plugin) uses no sources of actinia_core
* [actinia-stac-plugin](https://github.com/mundialis/actinia-stac-plugin) (stac)
* [actinia-tiling-plugin](https://github.com/mundialis/actinia-tiling-plugin) (tiling)
* [actinia-api](https://github.com/mundialis/actinia-api) (api)
* [actinia-module-plugin](https://github.com/actinia-org/actinia-module-plugin) (amp)
* [actinia_statistic_plugin](https://github.com/actinia-org/actinia_statistic_plugin) (statistic)
* [actinia_satallite_plugin](https://github.com/actinia-org/actinia_satellite_plugin) (satellite)
* [actinia-metadata-plugin](https://github.com/actinia-org/actinia-metadata-plugin) uses no sources of actinia_core
* [actinia-stac-plugin](https://github.com/actinia-org/actinia-stac-plugin) (stac)
* [actinia-tiling-plugin](https://github.com/actinia-org/actinia-tiling-plugin) (tiling)
* [actinia-api](https://github.com/actinia-org/actinia-api) (api)

The modules inside common folder are not only commonly used by actinia but also by actinia plugins.
Some other modules outside of core folder are concerned as well.
Expand Down
2 changes: 1 addition & 1 deletion src/actinia_core/models/openapi/README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Moved to https://github.com/mundialis/actinia-api
Moved to https://github.com/actinia-org/actinia-api

0 comments on commit 8877b7c

Please sign in to comment.