From e83cd93532697f03c34df3786d4e742b26b04714 Mon Sep 17 00:00:00 2001 From: Chen Kasirer Date: Fri, 14 Jun 2024 19:52:55 +0200 Subject: [PATCH] updated license requirements and workflows --- .github/workflows/build.yml | 20 +++++++++++++++----- .github/workflows/docs.yml | 19 ------------------- .github/workflows/release.yml | 30 ------------------------------ LICENSE | 2 +- requirements-dev.txt | 1 + tests/test_placeholder.py | 2 -- tests/test_trivial.py | 6 ++++++ 7 files changed, 23 insertions(+), 57 deletions(-) delete mode 100644 .github/workflows/docs.yml delete mode 100644 .github/workflows/release.yml delete mode 100644 tests/test_placeholder.py create mode 100644 tests/test_trivial.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9d5124..b3819b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,6 @@ on: jobs: build: - if: "!contains(github.event.pull_request.labels.*.name, 'docs-only')" runs-on: ${{ matrix.os }} strategy: matrix: @@ -18,8 +17,19 @@ jobs: python: ['3.8', '3.9', '3.10'] steps: - - uses: compas-dev/compas-actions.build@v3 + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up Python + uses: actions/setup-python@v3 with: - python: ${{ matrix.python }} - invoke_lint: true - invoke_test: true + python-version: ${{ matrix.python }} + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements-dev.txt + + - name: Run tests + run: pytest + diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index 7a04c2a..0000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: docs - -on: - push: - branches: - - main - tags: - - 'v*' - pull_request: - branches: - - main - -jobs: - docs: - runs-on: ubuntu-latest - steps: - - uses: compas-dev/compas-actions.docs@v2 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 5a61c5a..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: release - -on: - push: - tags: - - 'v*' - -jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - python: ['3.8', '3.9', '3.10'] - - steps: - - uses: compas-dev/compas-actions.build@v3 - with: - python: ${{ matrix.python }} - invoke_lint: true - invoke_test: true - - Publish: - needs: build - runs-on: ubuntu-latest - steps: - - uses: compas-dev/compas-actions.publish@v2 - with: - pypi_token: ${{ secrets.PYPI }} - github_token: ${{ secrets.TOKEN }} diff --git a/LICENSE b/LICENSE index 2e2f078..72aac2c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License - +Copyright (c) 2024 Gramazio Kohler Research Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/requirements-dev.txt b/requirements-dev.txt index 9831f85..a4f1d5e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,4 @@ +pytest-mock attrs >=17.4 black >=22.12.0 bump-my-version diff --git a/tests/test_placeholder.py b/tests/test_placeholder.py deleted file mode 100644 index 3ada1ee..0000000 --- a/tests/test_placeholder.py +++ /dev/null @@ -1,2 +0,0 @@ -def test_placeholder(): - assert True diff --git a/tests/test_trivial.py b/tests/test_trivial.py new file mode 100644 index 0000000..c1432fe --- /dev/null +++ b/tests/test_trivial.py @@ -0,0 +1,6 @@ +from installlib.flow import Sequence +from installlib.flow import Resource + + +def test_placeholder(): + assert Sequence()