Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing license info in packaging #187

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
28 changes: 28 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: s4cmd

on: [push]

jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
python-version: [2.7, 3.6, 3.7, 3.8, 3.9] #TODO '3.9-dev' and 'nightly'

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
sudo apt-get -qq update
sudo apt-get install -y tree
python -m pip install --upgrade pip
pip install flake8 pytest pytz boto3
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Test
run: |
BUILD_ID=$BUILD_NUMBER && ./runtests.sh
19 changes: 0 additions & 19 deletions .travis.yml

This file was deleted.

4 changes: 3 additions & 1 deletion runtests.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

set -e

#
# Copyright 2012-2021 BloomReach, Inc.
#
Expand Down Expand Up @@ -839,7 +841,7 @@ fi


echo 'Initializing...'
initialize > /dev/null 2>&1
initialize #> /dev/null 2>&1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't pollute the stdout.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@debodirno - sure, pls have a look of my previous comment - where I wanted to see what is the error when trying to run the tests using github actions. To see error messages I had to comment the redirection. I a happy to comment it back, but I assume you are not merging without green tests? Let me know pls.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am checking what we can do to get the repository active again for development and contribution.

echo "Executing test cases with $PYTHON_VERSION"
pushd $LOCALDIR > /dev/null
for case in $TEST_CASES
Expand Down
8 changes: 7 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

__author__ = "Chou-han Yang"
__copyright__ = "Copyright 2012-2018 BloomReach, Inc."
__license__ = "http://www.apache.org/licenses/LICENSE-2.0"
__license__ = "Apache License 2.0"
__version__ = "2.1.0"
__maintainer__ = "Navin Pai, Naveen Vardhi"
__status__ = "Development"
Expand All @@ -44,6 +44,7 @@ def run(self):
description='Super S3 command line tool',
author=__author__,
license=__license__,
license_files = ["LICENSE"],
long_description=long_description,
long_description_content_type='text/markdown',
url='https://github.com/bloomreach/s4cmd',
Expand All @@ -55,4 +56,9 @@ def run(self):
's4cmd = s4cmd:main',
]},
cmdclass={'install': install},
classifiers=[
"Programming Language :: Python :: 3",
"License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
],
)