diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 7c1555c..d174a3f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,25 @@ -Yasmine v2.1.0, 2019/12/06 +2023/10/06 : 4.1.1-beta + - Fix obsolete Docker images version + - Fix obsolete Python package requirements + - Rebuild changelog history +2022/06/03 : 4.1.0-beta + - Missing default values in NRL wizard + - Remove unnecessary execution bit + - Fix installation for Apple M1 CPU + - Fix requirements and library versions for frontend + - Update and optimize Docker installation + - Updated README and documentation + - Correct numpy version requirement + - Correct link to AROL library + +2021/10/25 : 4.0.2 + - Improvement of installation instructions + +2021/10/05 : 4.0.0 + - First public release + +2019/12/06 : 2.1.0 - 1. Extract specific elements from a stationXML file to populate the user libraries - 2. Use of a user-defined instrument atomic library - 3. Use of user-defined objects libraries (comments, geology, vault, units ....) diff --git a/README.md b/README.md index e3072b5..d419cb0 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,6 @@ Development and addition of new features is shared and agreed upon between IRIS ## Known issues Even if we have performed a lot of tests, Yasmine is currently released in beta version and some bugs and limitations might still be found. -Installation setup currently fails with `numpy-1.22.2`. It is recommended to use `numpy-1.21.5` instead. - The new **AROL** (Atomic Response Objects Library) instrument response library, from Résif, is still in depoyment stage and only includes a limited set of instruments. Users are encouraged to use the **NRL** library, also available. @@ -20,21 +18,12 @@ Please read the included .docx manual for instructions on how to get started usi If there is no internet connection, unzip the bundled NRL (IRIS.zip) in the `data` folder at the root of this repository. -### Installation using Python -1. Install Python 3.6.5 or greater -2. Run `python -m venv env` -3. Run `source env/bin/activate` -4. Run `pip install --upgrade pip setuptools` -5. Run `pip install YASMINE-x.x.tar.gz` -6. Run `sudo yasmineapp.py syncdb upgrade heads` -7. Run `sudo yasmineapp.py runserver` -8. Visit - ### Installation using Docker 1. Install [Docker Compose](https://docs.docker.com/compose/install/) or [Docker Desktop](https://www.docker.com/products/docker-desktop) -2. Run `docker-compose up` to start -3. Visit -4. Run `docker-compose down` to stop +2. Run `docker-compose build` to compile and build the containers +3. Run `docker-compose up` to start +4. Visit +5. Run `docker-compose down` to stop If you are running on an Apple M1 machine, uncomment the lines indicating the target platform in the `docker-compose.yml` file. @@ -45,6 +34,6 @@ If you are running on an Apple M1 machine, uncomment the lines indicating the ta ## More information * [Incorporated Research Institutions for Seismology (IRIS) Data Services](https://ds.iris.edu) -* [réseau sismologique et géodésique français (Résif)](https://www.resif.fr/) +* [Réseau sismologique et géodésique français (Résif)](https://www.resif.fr/) * [FDSN StationXML Manual](https://stationxml-doc.readthedocs.io/en/release-1.1.0/) * [Nominal Response Library (NRL)](https://ds.iris.edu/ds/nrl/) diff --git a/backend/Dockerfile b/backend/Dockerfile index 27bc5ce..07e3033 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -30,7 +30,7 @@ # # ****************************************************************************/ -FROM python:3.6.5-slim +FROM python:3-slim WORKDIR /opt/yasmine/src RUN apt-get update && apt-get install -y wget unzip gnupg gcc @@ -51,4 +51,4 @@ COPY requirements.txt . RUN pip install --upgrade pip && \ pip install -r requirements.txt COPY . . -CMD python yasmineapp.py syncdb upgrade heads ; python yasmineapp.py runserver --debug \ No newline at end of file +CMD python yasmineapp.py syncdb upgrade heads ; python yasmineapp.py runserver --debug diff --git a/backend/requirements.txt b/backend/requirements.txt index 20b7476..feecc95 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,18 +1,18 @@ jsonschema~=3.2.0 xmljson~=0.2.0 lxml -jsonref==0.2 -tornado==5.0.2 -SQLAlchemy==1.1.4 -alembic==0.9.9 -selenium==3.12.0 -tzlocal==1.5.1 -pytz==2018.4 -humanize==0.5.1 -obspy==1.2.* -jsonpickle==0.9.5 -apscheduler==3.5.1 -python-slugify==1.2.6 -xmlunittest==0.5.0 -pyyaml==5.1.2 -requests==2.22.0 +jsonref>=0.2 +tornado>=5.0.2 +SQLAlchemy==1.3.* +alembic>=0.9.9 +selenium>=3.12.0 +tzlocal>=1.5.1 +pytz>=2018.4 +humanize>=0.5.1 +obspy>=1.2.2 +jsonpickle>=0.9.5 +apscheduler>=3.5.1 +python-slugify>=1.2.6 +xmlunittest>=0.5.0 +pyyaml>=5.1.2 +requests>=2.22.0 diff --git a/frontend/Dockerfile b/frontend/Dockerfile index a81f1a9..d2b413b 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -30,7 +30,7 @@ # # ****************************************************************************/ -FROM eclipse-temurin:8u332-b09-jre-focal +FROM eclipse-temurin:8-jre RUN apt-get update RUN apt-get install -y wget unzip diff --git a/frontend/app.json b/frontend/app.json index 11a041c..7dda501 100644 --- a/frontend/app.json +++ b/frontend/app.json @@ -1,7 +1,7 @@ { "name": "yasmine", "namespace": "yasmine", - "version": "4.1.0-beta", + "version": "4.1.1-beta", "framework": "ext", /**