Skip to content
This repository has been archived by the owner on Oct 16, 2021. It is now read-only.

pysmbc v1.0.22 #3

Merged
merged 7 commits into from
Aug 30, 2020
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
24 changes: 15 additions & 9 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ cxx_compiler:
cxx_compiler_version:
- '7'
docker_image:
- condaforge/linux-anvil-comp7
- nsls2/nsls2forge:latest
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.6'
target_platform:
- linux-64
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ cxx_compiler:
cxx_compiler_version:
- '7'
docker_image:
- condaforge/linux-anvil-comp7
- nsls2/nsls2forge:latest
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.7'
target_platform:
- linux-64
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ cxx_compiler:
cxx_compiler_version:
- '7'
docker_image:
- condaforge/linux-anvil-comp7
- nsls2/nsls2forge:latest
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.8'
target_platform:
- linux-64
5 changes: 3 additions & 2 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion .scripts/run_docker_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LICENSE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 7 additions & 25 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions recipe/0001-setup.py-v1.0.22-install-issues.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/setup.py b/setup.py
index 7b14416..579e795 100755
--- a/setup.py
+++ b/setup.py
@@ -79,6 +79,16 @@ def pkgconfig_Dversion(pkg, prefix=None):
stdout=subprocess.PIPE)
(stdout, stderr) = c.communicate()
vers = stdout.decode('ascii').rstrip().split('.')
+ if len(vers) < 3:
+ c = subprocess.Popen([pkg, "-V"],
+ stdout=subprocess.PIPE)
+ (stdout, stderr) = c.communicate()
+ vers = stdout.decode('ascii') \
+ .replace('Version ', '') \
+ .strip() \
+ .split('-')[0] \
+ .split('.')
+ assert len(vers) >= 3, 'The length ({}) of vers ({}) is less than 3.'.format(len(vers), vers)
ver = str(int(vers[0]) * 10000 + int(vers[1]) * 100 + int(vers[2]))
return [(prefix + 'VERSION', ver)]

4 changes: 4 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ channel_sources:
- nsls2forge,defaults
channel_targets:
- nsls2forge main
docker_image:
- nsls2/nsls2forge:latest
cuda_compiler_version:
- None
python:
- 3.6
- 3.7
Expand Down
10 changes: 7 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
{% set name = "pysmbc" %}
{% set version = "1.0.15.8" %}
{% set sha256 = "0567c1789a911500b83c64becdaa0015c135cce0bcf59ec593df48859bebbf1d" %}
{% set version = "1.0.22" %}
{% set sha256 = "f9ce6f8cf17a2e7867b3cd87b2a47eca04ed955f37937b617088698c06177eba" %}

package:
name: {{ name|lower }}
version: {{ version }}

source:
url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.bz2 # The extension has changed in the latest versions to .tar.gz
url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz # The extension has changed in the latest versions to .tar.gz
sha256: {{ sha256 }}
patches:
# See the bug report at https://github.com/hamano/pysmbc/issues/53 and the
# proposed fix in https://github.com/hamano/pysmbc/pull/54.
- 0001-setup.py-v1.0.22-install-issues.patch

build:
number: 0
Expand Down
1 change: 1 addition & 0 deletions recipe/yum_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
samba-client
libsmbclient-devel