diff --git a/.travis.yml b/.travis.yml index e64cf101..fb60d796 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,32 @@ language: python matrix: include: - - env: DIST=centos_7_py2 - - env: DIST=centos_7_rpm - - env: DIST=debian_jessie_py2 - - env: DIST=debian_jessie_py3 - - env: DIST=fedora_27_py2 - - env: DIST=fedora_27_py3 - - env: DIST=fedora_28_py2 - - env: DIST=fedora_28_py3 - - env: DIST=fedora_27_rpm - - env: DIST=fedora_28_rpm - - env: DIST=ubuntu_xenial_py2 - - env: DIST=ubuntu_bionic_py2 - - env: DIST=ubuntu_bionic_py3 - - env: DIST=ubuntu_bionic_py3_pep8 - - env: DIST=ubuntu_bionic_py3_mypy - - env: DIST=ubuntu_bionic_doc + - env: DIST=eduvpn_centos_7_py2 + - env: DIST=eduvpn_centos_7_rpm + - env: DIST=eduvpn_debian_jessie_py2 + - env: DIST=eduvpn_debian_jessie_py3 + - env: DIST=eduvpn_fedora_27_py2 + - env: DIST=eduvpn_fedora_27_py3 + - env: DIST=eduvpn_fedora_28_py2 + - env: DIST=eduvpn_fedora_28_py3 + - env: DIST=eduvpn_fedora_27_rpm + - env: DIST=eduvpn_fedora_28_rpm + - env: DIST=eduvpn_ubuntu_xenial_py2 + - env: DIST=eduvpn_ubuntu_bionic_py2 + - env: DIST=eduvpn_ubuntu_bionic_py3 + - env: DIST=eduvpn_ubuntu_bionic_py3_pep8 + - env: DIST=eduvpn_ubuntu_bionic_py3_mypy + - env: DIST=eduvpn_ubuntu_bionic_doc + - env: DIST=lets_connect_centos_7_rpm + - env: DIST=lets_connect_fedora_27_rpm + - env: DIST=lets_connect_fedora_28_rpm sudo: required services: - docker before_install: - true install: -- docker build . -t ${DIST} -f docker/Dockerfile.${DIST} +- docker build . -t ${DIST} -f docker/${DIST} before_script: - true script: diff --git a/docker/Dockerfile.centos_7_py2 b/docker/eduvpn_centos_7_py2 similarity index 100% rename from docker/Dockerfile.centos_7_py2 rename to docker/eduvpn_centos_7_py2 diff --git a/docker/Dockerfile.centos_7_rpm b/docker/eduvpn_centos_7_rpm similarity index 100% rename from docker/Dockerfile.centos_7_rpm rename to docker/eduvpn_centos_7_rpm diff --git a/docker/Dockerfile.debian_jessie_py2 b/docker/eduvpn_debian_jessie_py2 similarity index 100% rename from docker/Dockerfile.debian_jessie_py2 rename to docker/eduvpn_debian_jessie_py2 diff --git a/docker/Dockerfile.debian_jessie_py3 b/docker/eduvpn_debian_jessie_py3 similarity index 100% rename from docker/Dockerfile.debian_jessie_py3 rename to docker/eduvpn_debian_jessie_py3 diff --git a/docker/Dockerfile.fedora_27_py2 b/docker/eduvpn_fedora_27_py2 similarity index 100% rename from docker/Dockerfile.fedora_27_py2 rename to docker/eduvpn_fedora_27_py2 diff --git a/docker/Dockerfile.fedora_27_py3 b/docker/eduvpn_fedora_27_py3 similarity index 100% rename from docker/Dockerfile.fedora_27_py3 rename to docker/eduvpn_fedora_27_py3 diff --git a/docker/Dockerfile.fedora_27_rpm b/docker/eduvpn_fedora_27_rpm similarity index 100% rename from docker/Dockerfile.fedora_27_rpm rename to docker/eduvpn_fedora_27_rpm diff --git a/docker/Dockerfile.fedora_28_py2 b/docker/eduvpn_fedora_28_py2 similarity index 100% rename from docker/Dockerfile.fedora_28_py2 rename to docker/eduvpn_fedora_28_py2 diff --git a/docker/Dockerfile.fedora_28_py3 b/docker/eduvpn_fedora_28_py3 similarity index 100% rename from docker/Dockerfile.fedora_28_py3 rename to docker/eduvpn_fedora_28_py3 diff --git a/docker/Dockerfile.fedora_28_rpm b/docker/eduvpn_fedora_28_rpm similarity index 100% rename from docker/Dockerfile.fedora_28_rpm rename to docker/eduvpn_fedora_28_rpm diff --git a/docker/Dockerfile.ubuntu_bionic_doc b/docker/eduvpn_ubuntu_bionic_doc similarity index 100% rename from docker/Dockerfile.ubuntu_bionic_doc rename to docker/eduvpn_ubuntu_bionic_doc diff --git a/docker/Dockerfile.ubuntu_bionic_py2 b/docker/eduvpn_ubuntu_bionic_py2 similarity index 100% rename from docker/Dockerfile.ubuntu_bionic_py2 rename to docker/eduvpn_ubuntu_bionic_py2 diff --git a/docker/Dockerfile.ubuntu_bionic_py3 b/docker/eduvpn_ubuntu_bionic_py3 similarity index 100% rename from docker/Dockerfile.ubuntu_bionic_py3 rename to docker/eduvpn_ubuntu_bionic_py3 diff --git a/docker/Dockerfile.ubuntu_bionic_py3_mypy b/docker/eduvpn_ubuntu_bionic_py3_mypy similarity index 100% rename from docker/Dockerfile.ubuntu_bionic_py3_mypy rename to docker/eduvpn_ubuntu_bionic_py3_mypy diff --git a/docker/Dockerfile.ubuntu_bionic_py3_pep8 b/docker/eduvpn_ubuntu_bionic_py3_pep8 similarity index 100% rename from docker/Dockerfile.ubuntu_bionic_py3_pep8 rename to docker/eduvpn_ubuntu_bionic_py3_pep8 diff --git a/docker/Dockerfile.ubuntu_xenial_py2 b/docker/eduvpn_ubuntu_xenial_py2 similarity index 100% rename from docker/Dockerfile.ubuntu_xenial_py2 rename to docker/eduvpn_ubuntu_xenial_py2 diff --git a/docker/letsconnect.centos_7_rpm b/docker/lets_connect_centos_7_rpm similarity index 87% rename from docker/letsconnect.centos_7_rpm rename to docker/lets_connect_centos_7_rpm index 0344b02e..50dde6c0 100644 --- a/docker/letsconnect.centos_7_rpm +++ b/docker/lets_connect_centos_7_rpm @@ -33,7 +33,6 @@ WORKDIR /code RUN python setup_letsconnect.py sdist RUN cp dist/*.tar.gz /root/rpmbuild/SOURCES/. - -RUN rpmbuild -bs rpm/letsconnect_centos7.spec -#RUN rpmbuild -bb rpm/letsconnect_centos7.spec +RUN rpmbuild -bs rpm/lets_connect_centos7.spec +RUN rpmbuild -bb rpm/lets_connect_centos7.spec diff --git a/docker/lets_connect_fedora_27_rpm b/docker/lets_connect_fedora_27_rpm new file mode 100644 index 00000000..75651e71 --- /dev/null +++ b/docker/lets_connect_fedora_27_rpm @@ -0,0 +1,45 @@ +FROM fedora:27 + +RUN dnf install -y \ + fedora-packager \ + fedora-review \ + gtk3 \ + libnotify \ + python2-devel \ + python-gobject \ + python2-configparser \ + python2-future \ + python2-pynacl \ + python2-requests-oauthlib \ + python2-cryptography \ + python2-pillow \ + python2-mock \ + python-qrcode \ + python-repoze-lru \ + dbus-python \ + pytest \ + python3-devel \ + python3-future \ + python3-gobject \ + python3-pynacl \ + python3-requests-oauthlib \ + python3-dbus \ + python3-repoze-lru \ + python3-mock \ + python2-pytest-runner \ + python3-pytest-runner \ + python3-cryptography \ + python3-qrcode \ + python3-pillow + +RUN rpmdev-setuptree + +ADD . /code +WORKDIR /code + +RUN python setup_letsconnect.py sdist +RUN cp dist/*.tar.gz /root/rpmbuild/SOURCES/. +RUN rpmbuild -bs rpm/lets_connect_fedora.spec +RUN rpmbuild -bb rpm/lets_connect_fedora.spec + + diff --git a/docker/lets_connect_fedora_28_rpm b/docker/lets_connect_fedora_28_rpm new file mode 100644 index 00000000..7dc37af3 --- /dev/null +++ b/docker/lets_connect_fedora_28_rpm @@ -0,0 +1,45 @@ +FROM fedora:28 + +RUN dnf install -y \ + fedora-packager \ + fedora-review \ + gtk3 \ + libnotify \ + python2-devel \ + python-gobject \ + python2-configparser \ + python2-future \ + python2-pynacl \ + python2-requests-oauthlib \ + python2-cryptography \ + python2-qrcode \ + python2-pillow \ + python-repoze-lru \ + dbus-python \ + python3-devel \ + python3-future \ + python3-gobject \ + python3-pynacl \ + python3-requests-oauthlib \ + python3-dbus \ + python3-repoze-lru \ + pytest \ + python2-mock \ + python3-mock \ + python2-pytest-runner \ + python3-pytest-runner \ + python3-cryptography \ + python3-qrcode \ + python3-pillow + +RUN rpmdev-setuptree + +ADD . /code +WORKDIR /code + +RUN python setup_letsconnect.py sdist +RUN cp dist/*.tar.gz /root/rpmbuild/SOURCES/. +RUN rpmbuild -bs rpm/lets_connect_fedora.spec +RUN rpmbuild -bb rpm/lets_connect_fedora.spec + + diff --git a/setup_letsconnect.py b/setup_letsconnect.py index 389ec517..244d7c71 100644 --- a/setup_letsconnect.py +++ b/setup_letsconnect.py @@ -29,7 +29,7 @@ } data_files = [ - ('share/applications', ['share/applications/letsconnect.desktop']), + ('share/applications', ['share/applications/lets-connect-client.desktop']), ('share/eduvpn', [ 'share/eduvpn/eduvpn.png', 'share/eduvpn/institute.png', @@ -71,7 +71,7 @@ setup( - name="letsconnect_client", + name="lets_connect_client", version=__version__, packages=find_packages(), data_files=data_files, diff --git a/share/applications/letsconnect.desktop b/share/applications/lets-connect-client.desktop similarity index 100% rename from share/applications/letsconnect.desktop rename to share/applications/lets-connect-client.desktop