From c8614ed04822d024f7eca1660bbfbf852aa66d46 Mon Sep 17 00:00:00 2001 From: FedorSarafanov Date: Fri, 29 Apr 2022 20:57:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BD=D0=BE=D0=BC=D0=B5=D1=80=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=81=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .appveyor.yml | 26 ------------- .github/dependabot.yml | 16 -------- .github/workflows/conda.yml | 44 ---------------------- .github/workflows/pip.yml | 66 -------------------------------- .github/workflows/wheels.yml | 73 ------------------------------------ .pre-commit-config.yaml | 66 -------------------------------- .travis.yml | 36 ------------------ setup.py | 3 +- 8 files changed, 1 insertion(+), 329 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .github/dependabot.yml delete mode 100644 .github/workflows/conda.yml delete mode 100644 .github/workflows/pip.yml delete mode 100644 .github/workflows/wheels.yml delete mode 100644 .pre-commit-config.yaml delete mode 100644 .travis.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 213c77e..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,26 +0,0 @@ -version: '{build}' -image: Visual Studio 2015 -platform: -- x86 -- x64 -environment: - global: - DISTUTILS_USE_SDK: 1 - PYTHONWARNINGS: ignore:DEPRECATION - MSSdk: 1 - matrix: - - PYTHON: 36 -install: -- cmd: '"%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PLATFORM%' -- ps: | - if ($env:PLATFORM -eq "x64") { $env:PYTHON = "$env:PYTHON-x64" } - $env:PATH = "C:\Python$env:PYTHON\;C:\Python$env:PYTHON\Scripts\;$env:PATH" - python -m pip install --disable-pip-version-check --upgrade --no-warn-script-location pip build virtualenv -build_script: -- ps: | - python -m build -s - cd dist - python -m pip install --verbose python_example-0.0.1.tar.gz - cd .. -test_script: -- ps: python tests\test.py diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 7327336..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: 2 -updates: - # Maintain dependencies for GitHub Actions - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - ignore: - # Official actions have moving tags like v1 - # that are used, so they don't need updates here - - dependency-name: "actions/checkout" - - dependency-name: "actions/setup-python" - - dependency-name: "actions/cache" - - dependency-name: "actions/upload-artifact" - - dependency-name: "actions/download-artifact" - - dependency-name: "actions/labeler" diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml deleted file mode 100644 index e3839d0..0000000 --- a/.github/workflows/conda.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Conda - -on: - workflow_dispatch: - push: - branches: - - master - pull_request: - -jobs: - build: - strategy: - fail-fast: false - matrix: - platform: [ubuntu-latest, windows-latest, macos-latest] - python-version: ["3.6", "3.8"] - - runs-on: ${{ matrix.platform }} - - # The setup-miniconda action needs this to activate miniconda - defaults: - run: - shell: "bash -l {0}" - - steps: - - uses: actions/checkout@v2 - - - name: Get conda - uses: conda-incubator/setup-miniconda@v2.1.1 - with: - python-version: ${{ matrix.python-version }} - channels: conda-forge - - - name: Prepare - run: conda install conda-build conda-verify - - - name: Build - run: conda build conda.recipe - - - name: Install - run: conda install -c ${CONDA_PREFIX}/conda-bld/ python_example - - - name: Test - run: python tests/test.py diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml deleted file mode 100644 index a584191..0000000 --- a/.github/workflows/pip.yml +++ /dev/null @@ -1,66 +0,0 @@ -name: Pip - -on: - workflow_dispatch: - pull_request: - push: - branches: - - master - -jobs: - build: - strategy: - fail-fast: false - matrix: - platform: [windows-latest, macos-latest, ubuntu-latest] - python-version: ["3.6", "3.10"] - - runs-on: ${{ matrix.platform }} - - steps: - - uses: actions/checkout@v2 - - - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - - name: Add requirements - run: python -m pip install --upgrade wheel setuptools - - - name: Build and install - run: pip install --verbose . - - - name: Test - run: python tests/test.py - - build-mingw64: - runs-on: windows-latest - defaults: - run: - shell: msys2 {0} - steps: - - uses: msys2/setup-msys2@v2 - with: - update: true - install: >- - mingw-w64-x86_64-gcc - mingw-w64-x86_64-python-pip - mingw-w64-x86_64-python-wheel - - - uses: actions/checkout@v2 - - - name: Install pybind11 - # This is required because --no-build-isolation disable dependences - # installation - run: pip install pybind11 - - - name: Build and install - # --no-build-isolation is required because the vanilla setuptool does not - # support Mingw64.See patches here: - # https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-python-setuptools - # Without those patches build_ext fails with: - # error: --plat-name must be one of ('win32', 'win-amd64', 'win-arm32', 'win-arm64') - run: pip install --no-build-isolation . - - - name: Test - run: python tests/test.py diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml deleted file mode 100644 index 9a8001d..0000000 --- a/.github/workflows/wheels.yml +++ /dev/null @@ -1,73 +0,0 @@ -name: Wheels - -on: - workflow_dispatch: - pull_request: - push: - branches: - - master - release: - types: - - published - -jobs: - build_sdist: - name: Build SDist - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Build SDist - run: pipx run build --sdist - - - name: Check metadata - run: pipx run twine check dist/* - - - uses: actions/upload-artifact@v2 - with: - path: dist/*.tar.gz - - - build_wheels: - name: Wheels on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - - steps: - - uses: actions/checkout@v2 - - - uses: pypa/cibuildwheel@v2.4.0 - env: - CIBW_ARCHS_MACOS: auto universal2 - - - name: Verify clean directory - run: git diff --exit-code - shell: bash - - - name: Upload wheels - uses: actions/upload-artifact@v2 - with: - path: wheelhouse/*.whl - - - upload_all: - name: Upload if release - needs: [build_wheels, build_sdist] - runs-on: ubuntu-latest - if: github.event_name == 'release' && github.event.action == 'published' - - steps: - - uses: actions/setup-python@v2 - - - uses: actions/download-artifact@v2 - with: - name: artifact - path: dist - - - uses: pypa/gh-action-pypi-publish@v1.5.0 - with: - user: __token__ - password: ${{ secrets.pypi_password }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index 35b85e0..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,66 +0,0 @@ -# To use: -# -# pre-commit run -a -# -# Or: -# -# pre-commit install # (runs every time you commit in git) -# -# To update this file: -# -# pre-commit autoupdate -# -# See https://github.com/pre-commit/pre-commit - -ci: - autoupdate_commit_msg: "chore: update pre-commit hooks" - autofix_commit_msg: "style: pre-commit fixes" - -repos: -# Standard hooks -- repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 - hooks: - - id: check-added-large-files - - id: check-case-conflict - - id: check-merge-conflict - - id: check-symlinks - - id: check-yaml - exclude: ^conda\.recipe/meta\.yaml$ - - id: debug-statements - - id: end-of-file-fixer - - id: mixed-line-ending - - id: requirements-txt-fixer - - id: trailing-whitespace - -# Black, the code formatter, natively supports pre-commit -- repo: https://github.com/psf/black - rev: 21.9b0 - hooks: - - id: black - files: ^(docs) - -# Sort your imports in a standard form -- repo: https://github.com/PyCQA/isort - rev: 5.9.3 - hooks: - - id: isort - -# Upgrade older Python syntax -- repo: https://github.com/asottile/pyupgrade - rev: v2.29.0 - hooks: - - id: pyupgrade - args: ["--py36-plus"] - -# Changes tabs to spaces -- repo: https://github.com/Lucas-C/pre-commit-hooks - rev: v1.1.10 - hooks: - - id: remove-tabs - -# Suggested hook if you add a .clang-format file -# - repo: https://github.com/pre-commit/mirrors-clang-format -# rev: v13.0.0 -# hooks: -# - id: clang-format diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4cda477..0000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -language: cpp -dist: trusty -matrix: - include: - - os: linux - env: PYTHON=3.8 - - os: linux - env: CONDA=3.7 -before_install: -- | - export CXX=g++-4.8 CC=gcc-4.8 - if [ -n "$PYTHON" ]; then - python -m pip install --user virtualenv - virtualenv -p python${PYTHON:0:1} venv - source venv/bin/activate - elif [ -n "$CONDA" ]; then - wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda${CONDA:0:1}-latest-Linux-x86_64.sh - bash miniconda.sh -b -p $HOME/miniconda - export PATH="$HOME/miniconda/bin:$PATH" - conda config --set always_yes yes --set changeps1 no - conda config --add channels conda-forge - conda update -q conda - conda install -q conda-build - conda create -q -n test-environment python=$CONDA - source activate test-environment - fi -install: -- | - if [ -n "$PYTHON" ]; then - python -m pip install . - elif [ -n "$CONDA" ]; then - conda build conda.recipe --python $CONDA - conda install --use-local python_example - fi -script: -- python tests/test.py diff --git a/setup.py b/setup.py index c9884f6..603a89c 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from pybind11 import get_cmake_dir from pybind11.setup_helpers import Pybind11Extension, build_ext from setuptools import setup -__version__ = "0.0.1" +__version__ = "0.1.1" ext_modules = [ Pybind11Extension( @@ -26,7 +26,6 @@ setup( description="Read binary files from lightning detection network based on Boltek-StormPCI", long_description="", ext_modules=ext_modules, - extras_require={"test": "pytest"}, # Currently, build_ext only provides an optional "highest supported C++ # level" feature, but in the future it may provide more features. cmdclass={"build_ext": build_ext},