Skip to content

Commit 39811a4

Browse files
committed
gitlab ci
1 parent ac8d828 commit 39811a4

File tree

5 files changed

+8
-19
lines changed

5 files changed

+8
-19
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ build_manylinux_wheel_release:
1010
- apk add --no-cache bash git
1111
- git submodule update --init --recursive
1212
- chmod +x ./ci/gitlab/build-manylinux.sh
13-
- cp -r ./libssh2 ./ci/docker/manylinux_2014/libssh2
13+
- cp -r ./libssh2 ./ci/docker/manylinux_2010/libssh2
1414
- ./ci/gitlab/build-manylinux.sh
1515
artifacts:
1616
paths:

README.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ ___________________________________
276276

277277
Because frankly the manylinux1 docker containers won't run on my build hosts because I run up to date software and kernels.
278278
The manylinux1 docker images are also full of extremely old package versions that will not receive updates or security fixes. The way that ParallelSSH handled this was to bundle their own versions of libssh2, OpenSSL and zlib in the repository.
279-
I moved to manylinux2014 because 2010 had old packages. If someone asks for a manylinux2010 wheel, I'll provide one but for now 2014 is what will be built and provided.
280279

281280
Why did you drop Windows and OSX wheels?
282281
________________________________________

ci/docker/manylinux_2014/Dockerfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

ci/gitlab/build-manylinux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
export DOCKER_TAG=red_m/redlibssh2
44
rm -rf build dist ssh2/libssh2.*
55

6-
docker build -t $DOCKER_TAG ci/docker/manylinux_2014
6+
docker build -t $DOCKER_TAG ci/docker/manylinux_2010
77
docker run --rm -v `pwd`:/io $DOCKER_TAG /io/ci/gitlab/build-wheels.sh
88
ls wheelhouse/

setup.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@
9696
if USING_CYTHON:
9797
cmdclass['build_ext'] = build_ext
9898

99+
install_requires = []
100+
if sys.version_info==(2,7):
101+
install_requires.append('enum')
102+
99103
setup(
100104
name='redlibssh2',
101105
version=versioneer.get_version(),
@@ -113,6 +117,7 @@
113117
zip_safe=False,
114118
include_package_data=True,
115119
platforms='any',
120+
install_requires=install_requires,
116121
classifiers=[
117122
'Development Status :: 1 - Planning',
118123
# 'Development Status :: 5 - Production/Stable',
@@ -128,6 +133,7 @@
128133
'Programming Language :: Python :: 3.6',
129134
'Programming Language :: Python :: 3.7',
130135
'Programming Language :: Python :: 3.8',
136+
'Programming Language :: Python :: 3.9',
131137
'Topic :: System :: Shells',
132138
'Topic :: System :: Networking',
133139
'Topic :: Software Development :: Libraries',

0 commit comments

Comments
 (0)