Skip to content

Commit

Permalink
test 12-6
Browse files Browse the repository at this point in the history
  • Loading branch information
ameli committed Dec 3, 2023
1 parent cf7970e commit 8ae56d3
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/check-manifest.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: "Check Manifest"

on:
push:
branches:
- main
# push:
# branches:
# - main
release:
types: [published]

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-conda.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: deploy-conda

on:
push:
branches:
- main
# push:
# branches:
# - main
release:
types:
- published
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-docker.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: deploy-docker

on:
push:
branches:
- main
# push:
# branches:
# - main
release:
types:
- published
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.12'
python-version: '3.11'

# Build doxygen files in /docs/doxygen/output/html
- name: Build doxygen
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ jobs:
python -m pip install --upgrade numpy
- name: Build sdist
run: python setup.py sdist
run: python -m build . --sdist

- name: Upload artifacts
uses: actions/upload-artifact@v3
Expand Down
28 changes: 14 additions & 14 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,20 @@ def install_package(package):
# Import Setup Packages
# =====================

# Install setuptools package
try:
import setuptools # noqa F401
except ImportError:
# Install setuptools
install_package('setuptools')
import setuptools # noqa F401

from setuptools import Command
from setuptools.extension import Extension
from setuptools.errors import CompileError, LinkError, ExecError
from setuptools.command.build_ext import build_ext
# from Cython.Distutils import build_ext

# Import numpy
try:
import numpy
Expand All @@ -78,20 +92,6 @@ def install_package(package):
install_package('cython>=0.29,<3.0')
from Cython.Build import cythonize

# Install setuptools package
try:
import setuptools # noqa F401
except ImportError:
# Install setuptools
install_package('setuptools')
import setuptools # noqa F401

from setuptools import Command
from setuptools.extension import Extension
from setuptools.errors import CompileError, LinkError, ExecError
from setuptools.command.build_ext import build_ext
# from Cython.Distutils import build_ext


# =========================
# get environment variables
Expand Down

0 comments on commit 8ae56d3

Please sign in to comment.