Skip to content

Commit

Permalink
Merge pull request #34 from salute-developers/update_sklearn
Browse files Browse the repository at this point in the history
Обновил библиотеки
  • Loading branch information
bart0003 authored Aug 19, 2022
2 parents f9e91c6 + a411c3a commit ff30653
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 9 deletions.
16 changes: 11 additions & 5 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ on:
jobs:
build:

runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9]
os-version: ['ubuntu-20.04']
python-version: ['3.8', '3.9']

runs-on: ${{ matrix.os-version }}
name: unittests with py-${{ matrix.python-version }} on ${{ matrix.os-version }}

steps:
- uses: actions/checkout@v2
Expand All @@ -25,6 +29,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
uname -a
python -m pip install --upgrade pip
python -m pip install flake8
python -m pip install .
Expand All @@ -47,10 +52,11 @@ jobs:
run: |
docker-compose -f .github/docker-compose.yml up -d
python -m smart_kit create_app kafka_test_app
mv .github/kafka_config.yml kafka_test_app/static/configs/kafka_config.yml
mv .github/logging_config.yml kafka_test_app/static/configs/logging_config.yml
cp .github/kafka_config.yml kafka_test_app/static/configs/kafka_config.yml
cp .github/logging_config.yml kafka_test_app/static/configs/logging_config.yml
cd kafka_test_app
echo 'from smart_kit.start_points.main_loop_kafka import MainLoop' >> app_config.py
echo 'MAIN_LOOP = MainLoop' >> app_config.py
docker exec github_kafka_1 kafka-topics.sh --create --bootstrap-server localhost:9092 --partitions 3 --topic toTestApp
docker-compose -f ../.github/docker-compose.yml exec -T kafka kafka-topics.sh --create --bootstrap-server localhost:9092 --partitions 3 --topic toTestApp
timeout 10 python manage.py run_app || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi
cd ..
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,16 @@ ____

Вы можете ознакомиться с подробной документацией по работе со SmartApp Framework в [справочнике разработчика](#TODO: вставить ссылку).

# Разработка

## Запуск тестов

Для тестов используется `unittests`.
Тесты находятся в директории `tests`

```shell
python -m unittest discover -s tests -v
```

# Обратная связь

Expand Down
24 changes: 20 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
import platform
import sys

from setuptools import find_packages, setup
import versioneer

import versioneer

with open("README.md", "r", encoding="utf-8") as file:
long_description = file.read()


def tf_version():
if sys.platform == "darwin" and platform.machine() == "arm64":
return "tensorflow-macos==2.9.1"
elif sys.platform == "darwin" and platform.machine() == "x86_64":
return "tensorflow==2.9.1"
elif sys.platform == "linux" and platform.machine() == "x86_64":
return "tensorflow==2.9.1"
elif sys.platform == "linux" and platform.machine() == "aarch64":
return "tensorflow-aarch64==2.9.1"
return "tensorflow==2.9.1"


setup(
name="smart_app_framework",
version=versioneer.get_version(),
Expand All @@ -27,7 +43,7 @@
"dill==0.3.3",
"ics==0.6",
"Jinja2==3.0.3",
"keras==2.6.0",
"keras==2.9.0",
"lazy",
"nltk==3.5",
"numpy",
Expand All @@ -43,11 +59,11 @@
"redis",
"requests==2.22.0",
"rusenttokenize==0.0.5",
"scikit-learn==0.24.1",
"scikit-learn==1.1.1",
"setuptools",
"tabulate",
"tatsu==4.4.0",
"tensorflow==2.6.0",
tf_version(),
"timeout-decorator==0.4.1",
"tqdm",
"Twisted",
Expand Down

0 comments on commit ff30653

Please sign in to comment.