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

Release 3.4.1 to master #358

Merged
merged 51 commits into from
Sep 2, 2024
Merged
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
f43b436
Merge pull request #305 from apel/release-3.4.0
tofu-rocketry Feb 21, 2024
6646436
Change the unexpected logging to use log.exception (#314)
Will-Cross1 Apr 4, 2024
5206edc
Resolved issue 313
Will-Cross1 Apr 9, 2024
cf638e7
Fixed codeclimate whitespace and blanklines issues
Will-Cross1 Apr 9, 2024
7fe9cee
Resolved suggested changes
Will-Cross1 Apr 10, 2024
4017164
replaced log.exception with log.error
Will-Cross1 Apr 10, 2024
b3e692f
Merge pull request #318 from Will-Cross1/Replace-popen-to-OpenSSL-313
tofu-rocketry Apr 10, 2024
d728ab5
Bump docker/build-push-action from 5.1.0 to 5.3.0
dependabot[bot] Apr 10, 2024
6440602
Bump codecov/codecov-action from 3.1.4 to 4.3.0
dependabot[bot] Apr 10, 2024
34e16d4
Resolved #160
Will-Cross1 Apr 10, 2024
310ec19
Update code to generate OS specific rpms
Apr 10, 2024
914cf48
Update code to say where python scripts should be installed
Apr 10, 2024
d3a9364
Merge pull request #319 from Sae126V/GT-298-Issue-with-SSM-RPM-Build-…
tofu-rocketry Apr 10, 2024
18fdce8
Add linting to new shell build script
Will-Cross1 Apr 17, 2024
d915878
Correct spelling and refactor duplicate echos
Will-Cross1 Apr 17, 2024
d5e8811
Add double quotes to prevent word splitting
Will-Cross1 Apr 17, 2024
d03c230
Merge pull request #323 from Will-Cross1/303-add-linting-to-shell-script
tofu-rocketry Apr 17, 2024
7fc50f2
Bump actions/upload-artifact from 4.3.1 to 4.3.2
dependabot[bot] Apr 22, 2024
b58cc36
Update code to fix deb packages for python3
Apr 18, 2024
606904b
Update to fix rpmlint to perform rpm checks in given location
Apr 19, 2024
c4de9ff
Add quotes to the variable to prevent word splitting
Apr 23, 2024
301c0c8
Merge pull request #325 from Sae126V/Minor-fix-to-SSM-build-script
tofu-rocketry Apr 23, 2024
6dc3224
Update files for docker build on rocky 9
Will-Cross1 Apr 18, 2024
8a49424
Changed "python" to "python3" in dockerfile
Will-Cross1 Apr 23, 2024
446e328
Merge pull request #327 from Will-Cross1/315-pycparser-docker-build-i…
tofu-rocketry Apr 23, 2024
cb9968e
Bump actions/upload-artifact from 4.3.2 to 4.3.3
dependabot[bot] Apr 29, 2024
045b667
Replaced deprecated Maintainer tag to use Label
Will-Cross1 Apr 30, 2024
c10cba2
Made description more like the README file
Will-Cross1 May 2, 2024
14b6504
Split label across multiple lines
Will-Cross1 May 2, 2024
93f2116
Merge pull request #331 from Will-Cross1/328-add-labels-to-dockerfile
tofu-rocketry May 7, 2024
51cab9f
Bump codecov/codecov-action from 4.3.0 to 4.3.1
dependabot[bot] May 6, 2024
3db3324
Add supporting packages in RPM section for py3 to run in EL(8|9)
May 1, 2024
3ba8c9d
Add supporting packages in DEB section for py3
May 1, 2024
819a177
Add missing packages in DEB and RPM section for py2 support
May 1, 2024
d2a49a9
Update lintian to perform deb checks in given location
May 2, 2024
762cf6a
Merge pull request #332 from Sae126V/fix-for-ssm-build-script-in-el8
tofu-rocketry May 7, 2024
acc897f
Add reference to RVM installation guide
tofu-rocketry May 7, 2024
74df7a7
Improvements to GH Action unit tests
tofu-rocketry May 10, 2024
de304cd
Remove redundant Python 3 test from Travis
tofu-rocketry May 10, 2024
e3f5c81
Merge pull request #336 from tofu-rocketry/travis-actions
tofu-rocketry May 10, 2024
0e8592b
Update setup.py flow to perform basic setup standard commands
May 10, 2024
6f008a2
Change exit() to sys.exit()
tofu-rocketry May 21, 2024
a4a5c68
Bump docker/build-push-action from 5.3.0 to 6.1.0
dependabot[bot] Jun 24, 2024
acec218
Bump docker/build-push-action from 6.1.0 to 6.2.0
dependabot[bot] Jul 1, 2024
55e1400
Update pre-commit hooks
tofu-rocketry Jul 3, 2024
dd46970
Bump actions/upload-artifact from 4.3.3 to 4.3.4
dependabot[bot] Jul 8, 2024
7eb1ccd
Bump docker/build-push-action from 6.2.0 to 6.3.0
dependabot[bot] Jul 10, 2024
a8daf6f
Bump docker/build-push-action from 6.3.0 to 6.7.0
dependabot[bot] Aug 19, 2024
600cc6d
Bump actions/upload-artifact from 4.3.4 to 4.3.6
dependabot[bot] Aug 21, 2024
df59c2c
Update version numbers for 3.4.1
tofu-rocketry Aug 28, 2024
c265998
Update changelogs for 3.4.1
tofu-rocketry Aug 30, 2024
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
Prev Previous commit
Next Next commit
Update setup.py flow to perform basic setup standard commands
Now, `setup.py` will make use of the build step to install the package. Enabling separate flows for the build and install phases if specified.

We are currently NOT supporting a few standard commands that are out of scope or NOT being asked, listed below:
- `register`, `bdist_rpm`, `bdist_wininst`, `upload`.

Also, We do NOT support extra commands with the setup.py except a few commands like `develop`, `egg_info`, and `bdist_egg`.
  • Loading branch information
“Sae126V” authored and tofu-rocketry committed May 21, 2024
commit 0e8592b73a912fee72019400d946dc2281ffdd92
30 changes: 23 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,30 @@
from ssm import __version__


def setup_temp_files():
"""Create temporary files with deployment names. """
copyfile('bin/receiver.py', 'bin/ssmreceive')
copyfile('bin/sender.py', 'bin/ssmsend')
copyfile('scripts/apel-ssm.logrotate', 'conf/apel-ssm')
copyfile('README.md', 'apel-ssm')


def main():
"""Called when run as script, e.g. 'python setup.py install'."""
# Create temporary files with deployment names
if 'install' in sys.argv:
copyfile('bin/receiver.py', 'bin/ssmreceive')
copyfile('bin/sender.py', 'bin/ssmsend')
copyfile('scripts/apel-ssm.logrotate', 'conf/apel-ssm')
copyfile('README.md', 'apel-ssm')
supported_commands = {
"install",
"build",
"bdist",
"develop",
"build_scripts",
"install_scripts",
"install_data",
"bdist_dumb",
"bdist_egg",
}

if supported_commands.intersection(sys.argv):
setup_temp_files()

# conf_files will later be copied to conf_dir
conf_dir = '/etc/apel/'
Expand Down Expand Up @@ -79,7 +95,7 @@ def main():
)

# Remove temporary files with deployment names
if 'install' in sys.argv:
if supported_commands.intersection(sys.argv):
remove('bin/ssmreceive')
remove('bin/ssmsend')
remove('conf/apel-ssm')
Expand Down
Loading