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
168 changes: 84 additions & 84 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,87 +35,87 @@ jobs:
- template: .azure_pipelines/run_tests.yml
parameters: {name: 'Python_37', python: '3.7', architecture: 'x64', kind: 'native'}

- template: .azure_pipelines/run_tests.yml
parameters: {name: 'Python_34', python: '3.4', architecture: 'x64', kind: 'cython'}
- template: .azure_pipelines/run_tests.yml
parameters: {name: 'Python_34', python: '3.4', architecture: 'x86', kind: 'cython'}
- template: .azure_pipelines/run_tests.yml
parameters: {name: 'Python_35', python: '3.5', architecture: 'x64', kind: 'cython'}
- template: .azure_pipelines/run_tests.yml
parameters: {name: 'Python_35', python: '3.5', architecture: 'x86', kind: 'cython'}
- template: .azure_pipelines/run_tests.yml
parameters: {name: 'Python_36', python: '3.6', architecture: 'x64', kind: 'cython'}
- template: .azure_pipelines/run_tests.yml
parameters: {name: 'Python_36', python: '3.6', architecture: 'x86', kind: 'cython'}
- template: .azure_pipelines/run_tests.yml
parameters: {name: 'Python_37', python: '3.7', architecture: 'x64', kind: 'cython'}
- template: .azure_pipelines/run_tests.yml
parameters: {name: 'Python_37', python: '3.7', architecture: 'x86', kind: 'cython'}

- job: 'Build_and_deploy'
dependsOn:
- Python_34_x64_native
- Python_35_x64_native
- Python_36_x64_native
- Python_37_x64_native

- Python_34_x64_cython
- Python_34_x86_cython
- Python_35_x64_cython
- Python_35_x86_cython
- Python_36_x64_cython
- Python_36_x86_cython
- Python_37_x64_cython
- Python_37_x86_cython
condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
pool:
vmIMage: 'VS2017-Win2016'
strategy:
maxParallel: 6
matrix:
Python34_x64:
python.version: '3.4'
Python34_x86:
python.version: '3.4'
python.architecture: 'x86'
Python35_x64:
python.version: '3.5'
Python35_x86:
python.version: '3.5'
python.architecture: 'x86'
Python36_x64:
python.version: '3.6'
Python36_x86:
python.version: '3.6'
python.architecture: 'x86'
Python37_x64:
python.version: '3.7'
Python37_x86:
python.version: '3.7'
python.architecture: 'x86'

steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '$(python.version)'
architecture: '$(python.architecture)'

- script: |
python -m pip install --upgrade pip
pip install -U setuptools
pip install -r build_requirements.txt
displayName: 'Install dependencies'

- script: |
python setup.py bdist_wheel
displayName: 'Build'

- task: TwineAuthenticate@0
displayName: 'Twine Authenticate '
inputs:
externalFeeds: PyPI

- script: |
pip install -U twine
twine upload -r PyPI --config-file $(PYPIRC_PATH) dist/Advanced_Descriptors-* --skip-existing
displayName: 'Deploy'
#- template: .azure_pipelines/run_tests.yml
# parameters: {name: 'Python_34', python: '3.4', architecture: 'x64', kind: 'cython'}
#- template: .azure_pipelines/run_tests.yml
# parameters: {name: 'Python_34', python: '3.4', architecture: 'x86', kind: 'cython'}
#- template: .azure_pipelines/run_tests.yml
# parameters: {name: 'Python_35', python: '3.5', architecture: 'x64', kind: 'cython'}
#- template: .azure_pipelines/run_tests.yml
# parameters: {name: 'Python_35', python: '3.5', architecture: 'x86', kind: 'cython'}
#- template: .azure_pipelines/run_tests.yml
# parameters: {name: 'Python_36', python: '3.6', architecture: 'x64', kind: 'cython'}
#- template: .azure_pipelines/run_tests.yml
# parameters: {name: 'Python_36', python: '3.6', architecture: 'x86', kind: 'cython'}
#- template: .azure_pipelines/run_tests.yml
# parameters: {name: 'Python_37', python: '3.7', architecture: 'x64', kind: 'cython'}
#- template: .azure_pipelines/run_tests.yml
# parameters: {name: 'Python_37', python: '3.7', architecture: 'x86', kind: 'cython'}
#
#- job: 'Build_and_deploy'
# dependsOn:
# - Python_34_x64_native
# - Python_35_x64_native
# - Python_36_x64_native
# - Python_37_x64_native
#
# - Python_34_x64_cython
# - Python_34_x86_cython
# - Python_35_x64_cython
# - Python_35_x86_cython
# - Python_36_x64_cython
# - Python_36_x86_cython
# - Python_37_x64_cython
# - Python_37_x86_cython
# condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
# pool:
# vmIMage: 'VS2017-Win2016'
# strategy:
# maxParallel: 6
# matrix:
# Python34_x64:
# python.version: '3.4'
# Python34_x86:
# python.version: '3.4'
# python.architecture: 'x86'
# Python35_x64:
# python.version: '3.5'
# Python35_x86:
# python.version: '3.5'
# python.architecture: 'x86'
# Python36_x64:
# python.version: '3.6'
# Python36_x86:
# python.version: '3.6'
# python.architecture: 'x86'
# Python37_x64:
# python.version: '3.7'
# Python37_x86:
# python.version: '3.7'
# python.architecture: 'x86'
#
# steps:
# - task: UsePythonVersion@0
# inputs:
# versionSpec: '$(python.version)'
# architecture: '$(python.architecture)'
#
# - script: |
# python -m pip install --upgrade pip
# pip install -U setuptools
# pip install -r build_requirements.txt
# displayName: 'Install dependencies'
#
# - script: |
# python setup.py bdist_wheel
# displayName: 'Build'
#
# - task: TwineAuthenticate@0
# displayName: 'Twine Authenticate '
# inputs:
# externalFeeds: PyPI
#
# - script: |
# pip install -U twine
# twine upload -r PyPI --config-file $(PYPIRC_PATH) dist/Advanced_Descriptors-* --skip-existing
# displayName: 'Deploy'
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ def _extension(modpath: str) -> setuptools.Extension:
setuptools.Extension("threaded._asynciotask", ["threaded/_asynciotask.pyx"]),
setuptools.Extension("threaded._threaded", ["threaded/_threaded.pyx"]),
_extension("threaded._threadpooled"),
_extension("threaded._gthreadpooled"),
]

if "win32" != sys.platform:
requires_optimization.append(_extension("threaded.__init__"))
requires_optimization.append(_extension("threaded._gthreadpooled"))

# noinspection PyCallingNonCallable
ext_modules = (
Expand All @@ -73,7 +73,7 @@ def _extension(modpath: str) -> setuptools.Extension:
always_allow_keywords=True, binding=True, embedsignature=True, overflowcheck=True, language_level=3
),
)
if cythonize is not None
if cythonize is not None and "win32" != sys.platform
else []
)

Expand Down
2 changes: 1 addition & 1 deletion test/test_gevent_threadpooled.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@


@unittest.skipIf(gevent is None, "No gevent")
class TestThreadPooled(unittest.TestCase):
class TestGeventThreadPooled(unittest.TestCase):
def tearDown(self):
threaded.GThreadPooled.shutdown()

Expand Down