Skip to content
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
30 changes: 5 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
PACKAGE_NAME: "ansys.api.additive"
DEFINITION_VERSION: "v0"
DOTNET_VERSION: "6.0.x"
GITHUB_NUGET_REPO: "https://nuget.pkg.github.com/ansys-internal/index.json"
GITHUB_NUGET_REPO: "https://nuget.pkg.github.com/ansys/index.json"

jobs:
build:
Expand All @@ -27,13 +27,6 @@ jobs:
with:
python-version: ${{ env.MAIN_PYTHON_VERSION }}

# Uncomment once the proto files are stable enough on their side

# - name: Run protolint
# uses: plexsystems/[email protected]
# with:
# configDirectory: .

- name: Install build requirements
run: |
pip install -U pip
Expand Down Expand Up @@ -90,7 +83,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ env.MAIN_PYTHON_VERSION }}

Expand All @@ -99,27 +92,14 @@ jobs:
- name: Display structure of downloaded files
run: ls -R

# uncomment the following section to permit upload to public PyPI

# - name: Upload to Public PyPi
# run: |
# pip install twine
# twine upload --skip-existing ./**/*.whl
# twine upload --skip-existing ./**/*.tar.gz
# env:
# TWINE_USERNAME: __token__
# TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}

- name: Upload to Private PyPi
- name: Upload to Public PyPi
run: |
pip install twine
twine upload --skip-existing ./**/*.whl
twine upload --skip-existing ./**/*.tar.gz
env:
TWINE_USERNAME: PAT
TWINE_PASSWORD: ${{ secrets.PYANSYS_PYPI_PRIVATE_PAT }}
TWINE_REPOSITORY_URL: https://pkgs.dev.azure.com/pyansys/_packaging/pyansys/pypi/upload

TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}

- name: Release
uses: softprops/action-gh-release@v1
Expand Down
36 changes: 0 additions & 36 deletions .protolint.yaml

This file was deleted.

17 changes: 11 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
product = "additive"
library = ""
package_info = ["ansys", "api", product, library, "v0"]
with open(
os.path.join(HERE, "ansys", "api", product, library, "VERSION"), encoding="utf-8"
) as f:
with open(os.path.join(HERE, "ansys", "api", product, library, "VERSION"), encoding="utf-8") as f:
version = f.read().strip()

package_name = "ansys-api-additive"
Expand All @@ -30,14 +28,16 @@
name=package_name,
version=version,
author="ANSYS, Inc.",
author_email="[email protected]",
author_email='[email protected]',
maintainer="ANSYS, Inc.",
maintainer_email='[email protected]',
description=description,
long_description=long_description,
long_description_content_type="text/markdown",
url=f"https://github.com/ansys/{package_name}",
license="MIT",
python_requires=">=3.8",
install_requires=["grpcio~=1.47", "protobuf>=3.19,<5"],
python_requires=">=3.8,<4",
install_requires=["grpcio~=1.47", "protobuf~=3.19"],
packages=setuptools.find_namespace_packages(".", include=("ansys.*","google.*")),
package_data={
"": ["*.proto", "*.pyi", "py.typed", "VERSION"],
Expand All @@ -48,4 +48,9 @@
],
},
cmdclass=CMDCLASS_OVERRIDE,
project_urls={
'Documentation': 'https://github.com/ansys/ansys-api-additive/#readme',
'Source': 'https://github.com/ansys/ansys-api-additive/',
'Tracker': 'https://github.com/ansys/ansys-api-additive/issues/',
},
)