Skip to content

feat: add ansys-api-speos as private dependency. #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:

env:
MAIN_PYTHON_VERSION: '3.9'
PIP_EXTRA_INDEX_URL: 'https://${{ secrets.PYANSYS_PYPI_PRIVATE_PAT }}@pkgs.dev.azure.com/pyansys/_packaging/pyansys/pypi/simple/'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -24,22 +25,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: PyAnsys code style checks
uses: pyansys/actions/code-style@v3
uses: pyansys/actions/code-style@v4
with:
python-version: ${{ env.MAIN_PYTHON_VERSION }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip flit tox
- name: Test with tox
run: tox -e style

docs-style:
name: Documentation Style Check
runs-on: ubuntu-latest
steps:
- name: PyAnsys documentation style checks
uses: pyansys/actions/doc-style@v3
uses: pyansys/actions/doc-style@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -50,7 +45,7 @@ jobs:
needs: docs-style
steps:
- name: "Run Ansys documentation building action"
uses: pyansys/actions/doc-build@v3
uses: pyansys/actions/doc-build@v4
with:
python-version: ${{ env.MAIN_PYTHON_VERSION }}

Expand Down Expand Up @@ -91,7 +86,7 @@ jobs:
pip install .[tests]
docker-compose up -d
cd tests # so we're testing the install, not local
pytest -vx
pytest -vxs
docker kill optics_speos-rpc
docker rm optics_speos-rpc
env:
Expand Down
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ repos:


- repo: https://github.com/psf/black
rev: 22.12.0
rev: 23.1.0
hooks:
- id: black
args:
- --line-length=120

- repo: https://github.com/pycqa/isort
rev: 5.11.4
rev: 5.12.0
hooks:
- id: isort

Expand All @@ -26,7 +26,7 @@ repos:
- --max-line-length=120

- repo: https://github.com/codespell-project/codespell
rev: v2.2.2
rev: v2.2.4
hooks:
- id: codespell
args: ["--ignore-words=ignore_words.txt"]
Expand All @@ -39,7 +39,7 @@ repos:

# this validates our github workflow files
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.19.2
rev: 0.22.0
hooks:
- id: check-github-workflows

Expand All @@ -52,7 +52,7 @@ repos:
# additional_dependencies: [toml]

- repo: https://github.com/asottile/blacken-docs
rev: v1.12.1
rev: 1.13.0
hooks:
- id: blacken-docs
additional_dependencies: [black==22.12.0]
additional_dependencies: [black==23.1.0]
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ classifiers=[
"Operating System :: OS Independent",
]
dependencies=[
"ansys-optics-speos-grpcapi==8.1.0",
"grpcio==1.51.3",
"grpcio-tools==1.48.2",
"ansys-api-speos==0.1.0",
]

[project.optional-dependencies]
Expand Down
2 changes: 0 additions & 2 deletions tests/test_anisotropic_bsdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ def approx_cmp(a, b):


def compareAnisotropicBsdf(bsdf1, bsdf2):

# description
if bsdf1.description != bsdf2.description:
return False
Expand Down Expand Up @@ -235,7 +234,6 @@ def compareAnisotropicBsdf(bsdf1, bsdf2):


def compareEnhancementData(cones1, cones2):

if len(cones1.anisotropic_samples) != len(cones2.anisotropic_samples):
return False

Expand Down