Skip to content

Commit

Permalink
Merge pull request #462 from baobabsoluciones/release/v1.0.5
Browse files Browse the repository at this point in the history
Release/v1.0.5
  • Loading branch information
ggsdc authored May 5, 2023
2 parents 8397add + 371b267 commit f37fee1
Show file tree
Hide file tree
Showing 162 changed files with 3,062 additions and 2,575 deletions.
53 changes: 0 additions & 53 deletions .github/workflows/cornflow-core-publish-to-pypi.yml

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/test_cornflow_client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ jobs:
python -m pip install -U -r requirements.txt
CLIENT_BRANCH="${{ github.head_ref || github.ref_name }}"
python -m pip install -U "git+https://github.com/baobabsoluciones/cornflow@${CLIENT_BRANCH}#subdirectory=libs/client"
python -m pip install -U "git+https://github.com/baobabsoluciones/cornflow@${CLIENT_BRANCH}#subdirectory=libs/core"
flask db upgrade -d cornflow/migrations/
flask access_init
flask register_deployed_dags -r http://127.0.0.1:8080 -u admin -p admin
Expand Down
53 changes: 0 additions & 53 deletions .github/workflows/test_cornflow_core.yml

This file was deleted.

4 changes: 1 addition & 3 deletions .github/workflows/test_cornflow_server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ jobs:
CLIENT_BRANCH="${{ github.head_ref || github.ref_name }}"
python -m pip install --upgrade pip
python -m pip install -U -r requirements-dev.txt
python -m pip uninstall cornflow-core -y
python -m pip install -U "git+https://github.com/baobabsoluciones/cornflow@${CLIENT_BRANCH}#subdirectory=libs/core"
python -m pip uninstall cornflow-client -y
python -m pip install -U "git+https://github.com/baobabsoluciones/cornflow@${CLIENT_BRANCH}#subdirectory=libs/client"
- name: Install airflow
Expand Down Expand Up @@ -104,7 +102,7 @@ jobs:
AIRFLOW_CONN_CF_URI: http://airflow:Airflow_test_password1@localhost:5050
- name: Run unit tests
run: |
coverage run --source=./cornflow/ -m unittest discover -s cornflow/tests/unit
coverage run --source=./cornflow/ --omit="*/tests/data/*" -m unittest discover -s cornflow/tests/unit
coverage report -m
env:
FLASK_ENV: testing
Expand Down
12 changes: 4 additions & 8 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ Cornflow
:alt: GitHub Workflow Status
:target: https://github.com/baobabsoluciones/cornflow/actions

.. image:: https://img.shields.io/pypi/v/cornflow?label=cornflow&style=for-the-badge
:alt: PyPI
:target: https://pypi.python.org/pypi/cornflow

.. image:: https://img.shields.io/pypi/v/cornflow-client?label=cornflow-client&style=for-the-badge
:alt: PyPI
:target: https://pypi.python.org/pypi/cornflow-client

.. image:: https://img.shields.io/pypi/v/cornflow-core?label=cornflow-core&style=for-the-badge
:alt: PyPI
:target: https://pypi.python.org/pypi/cornflow-core

.. image:: https://img.shields.io/pypi/l/cornflow-client?color=blue&style=for-the-badge
:alt: PyPI - License
:target: https://github.com/baobabsoluciones/cornflow/blob/master/LICENSE
Expand All @@ -25,10 +25,6 @@ Cornflow
:alt: Codecov
:target: https://app.codecov.io/gh/baobabsoluciones/cornflow

.. image:: https://img.shields.io/codecov/c/gh/baobabsoluciones/cornflow?flag=core-tests&label=Core&logo=codecov&logoColor=white&style=for-the-badge&token=H14UGPUQVL
:alt: Codecov
:target: https://app.codecov.io/gh/baobabsoluciones/cornflow

.. image:: https://img.shields.io/codecov/c/gh/baobabsoluciones/cornflow?flag=dags-tests&label=dags&logo=codecov&logoColor=white&style=for-the-badge&token=H14UGPUQVL
:alt: Codecov
:target: https://app.codecov.io/gh/baobabsoluciones/cornflow
Expand Down
5 changes: 1 addition & 4 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ flag_management:
individual_flags:
- name: server-tests
paths:
- cornflow-server/
- name: core-tests
paths:
- libs/core/
- cornflow-server/
- name: client-tests
paths:
- libs/client/
Expand Down
2 changes: 1 addition & 1 deletion cornflow-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV DEBIAN_FRONTEND noninteractive
ENV TERM linux

# CORNFLOW vars
ARG CORNFLOW_VERSION=1.0.4
ARG CORNFLOW_VERSION=1.0.5

# install linux pkg
RUN apt update -y && apt-get install -y --no-install-recommends \
Expand Down
12 changes: 12 additions & 0 deletions cornflow-server/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
version 1.0.5
--------------

- released: 2023-05-04
- description: first version of cornflow without cornflow core
- changelog:
- removed cornflow core from dependencies.
- moved all cornflow core code to cornflow.
- added new error handling for InternalServerErrors.
- updated version of flask to 2.3.2 due to security reasons.
- updated version of other libraries due to upgrade on flask version.

version 1.0.4
---------------

Expand Down
6 changes: 3 additions & 3 deletions cornflow-server/cornflow/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
from cornflow.endpoints import resources, alarms_resources
from cornflow.endpoints.login import LoginEndpoint, LoginOpenAuthEndpoint
from cornflow.endpoints.signup import SignUpEndpoint
from cornflow.shared import db, bcrypt
from cornflow.shared.compress import init_compress
from cornflow.shared.const import AUTH_DB, AUTH_LDAP, AUTH_OID
from cornflow.shared.exceptions import initialize_errorhandlers
from cornflow.shared.log_config import log_config
from cornflow_core.compress import init_compress
from cornflow_core.exceptions import initialize_errorhandlers
from cornflow_core.shared import db, bcrypt


def create_app(env_name="development", dataconn=None):
Expand Down
Loading

0 comments on commit f37fee1

Please sign in to comment.