Skip to content

Commit

Permalink
Merge pull request #16 from th2-net/python-workflow
Browse files Browse the repository at this point in the history
Python workflow
  • Loading branch information
ConnectDIY authored Nov 10, 2024
2 parents e9c99a4 + dc87310 commit fbaedcc
Show file tree
Hide file tree
Showing 15 changed files with 625 additions and 649 deletions.
21 changes: 0 additions & 21 deletions .github/workflows/ci-tests.yml

This file was deleted.

53 changes: 0 additions & 53 deletions .github/workflows/dev-build-to-pypi.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/publish-release-candidate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: check and publish release candidate Python tarball to PyPi

on: workflow_dispatch

jobs:
build-job:
name: Check and publish snapshot tarball to PyPi
uses: th2-net/.github/.github/workflows/compound-python.yml@main
with:
release-type: release-candidate
style-check-enabled: false
strict-style-check: false
python-check-versions: "['3.8', '3.9', '3.10', '3.11', '3.12']"
test-dir: tests/
test-requirements-files: requirements.txt, requirements_dev.txt
create-tag: true

secrets:
pypi-password: ${{ secrets.PYPI_PASSWORD }}
19 changes: 19 additions & 0 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: check and publish release Python tarball to PyPi

on: workflow_dispatch

jobs:
build-job:
name: Check and publish snapshot tarball to PyPi
uses: th2-net/.github/.github/workflows/compound-python.yml@main
with:
release-type: release
style-check-enabled: false
strict-style-check: false
python-check-versions: "['3.8', '3.9', '3.10', '3.11', '3.12']"
test-dir: tests/
test-requirements-files: requirements.txt, requirements_dev.txt
create-tag: true

secrets:
pypi-password: ${{ secrets.PYPI_PASSWORD }}
24 changes: 24 additions & 0 deletions .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: check and publish snapshot Python tarball to PyPi

on:
push:
branches:
- dev_*
- pypi_*
paths-ignore:
- README.md

jobs:
build-job:
name: Check and publish snapshot tarball to PyPi
uses: th2-net/.github/.github/workflows/compound-python.yml@main
with:
release-type: development
style-check-enabled: false
strict-style-check: false
python-check-versions: "['3.8', '3.9', '3.10', '3.11', '3.12']"
test-dir: tests/
test-requirements-files: requirements.txt, requirements_dev.txt

secrets:
pypi-password: ${{ secrets.PYPI_PASSWORD }}
33 changes: 0 additions & 33 deletions .github/workflows/pypi-publish.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions .github/workflows/scanning.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![](https://img.shields.io/badge/python-3.7+-g.svg)](https://www.python.org/downloads/)
[![](https://img.shields.io/badge/python-3.8+-g.svg)](https://www.python.org/downloads/)

# Since v0.4 this repo use DS-core v2 structure and can be used only with DS-core v2

Expand Down
16 changes: 8 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
pandas==1.1.5
pandas>=2.0.0
plotly==5.2.1
setuptools==58.1.0
blake3==0.2.1
vaex-core==4.5.1
vaex==4.3.0
ipython~=7.16
setuptools>=75.1.0
blake3==0.4.1
# vaex-core==4.5.1
# vaex==4.3.0
ipython~=8.10.0
dask[dataframe]==2022.1.1 # The latest version that support Py 3.7
# numba==0.54.1
numpy>=1.22
numpy<2.0.0
ipykernel
matplotlib

# Uncomment it when ds lib v2 will be released
#th2-data-services>=2,<3 # ds core 2.*
th2-data-services~=2.0.0.dev
th2-data-services~=2.0.0.dev
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2020 Exactpro (Exactpro Systems Limited)
# Copyright 2020-2024 Exactpro (Exactpro Systems Limited)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -40,9 +40,9 @@
author_email="[email protected]",
url="https://github.com/th2-net/th2-data-services-utils",
license="Apache License 2.0",
python_requires=">=3.7",
python_requires=">=3.8",
install_requires=requirements,
packages=find_packages(include=["th2", 'th2.th2_data_services', 'th2.th2_data_services.utils','th2.th2_data_services.utils.pandas']),
namespace_packages = ['th2', 'th2.th2_data_services', 'th2.th2_data_services.utils'],
packages=find_packages(include=['th2_data_services', 'th2_data_services.utils', 'th2_data_services.utils.pandas']),
namespace_packages=['th2_data_services', 'th2_data_services.utils'],
include_package_data=True,
)
Loading

0 comments on commit fbaedcc

Please sign in to comment.