Enforce that all scripts use Python 3 rather than Python 2 #43

jsf9k · 2022-06-15T20:22:36Z

🗣 Description

This pull request makes a change to enforce that all the scripts contained in this repo use Python 3 vice Python 2.

💭 Motivation and context

The one remaining script that used Python 2 code appears to work with either Python 2 or Python 3, so it makes sense to insist on Python 3 now that Python 2 is EOL.

🧪 Testing

All automated tests pass.

@mcdonnnj, is this one line change something that can be manually done in production to verify that it functions as expected?

✅ Pre-approval checklist

This PR has an informative and human-readable title.
Changes are limited to a single goal - eschew scope creep!
All relevant type-of-change labels have been added.
I have read the CONTRIBUTING document.
These code changes follow cisagov code standards.
All relevant repo and/or project documentation has been updated to reflect the changes in this PR.
All new and existing tests pass.

✅ Pre-merge checklist

Finalize version.

✅ Post-merge checklist

Create a release.

dav3r · 2022-06-16T15:17:02Z

@mcdonnnj, is this one line change something that can be manually done in production to verify that it functions as expected?

We should be able to test that in either @mcdonnnj or my CyHy dev environments.

jsf9k · 2022-07-05T15:00:12Z

FYI, the main branch of this project is now failing APB builds.

This code appears to work with either Python 2 or Python 3, so it makes sense to insist on Python 3 now that Python 2 is EOL.

Realign setup.py with the version used in cisagov/skeleton-python-library now that we no longer need to support Python 2.

We no longer need to adjust the import depending on which major Python version is being used.

Until this project is converted into a proper Python package this is how it needs to be updated to reflect the package version.

Make sure the `build.yml` workflow in this project mirrors the one in cisagov/skeleton-python-library now that we no longer need to support Python 2.

jsf9k · 2023-04-18T21:22:22Z

@mcdonnnj, could you leave a comment here explaining why this PR cannot yet be merged?

mcdonnnj · 2023-04-18T21:57:01Z

@jsf9k Until we're deploying Debian Buster/Bullseye instances we have to consider Debian Stretch which only has Python 3.5. The lowest version of Python 3 this supports is 3.6 per

cyhy-feeds/setup.py

Line 83 in d02e28e

python_requires=">=3.6",

This PR can hopefully be merged this week as I finalize testing and prepare to deploy Debian Buster/Bullseye instances.

jsf9k · 2023-04-26T17:54:10Z

@jsf9k Until we're deploying Debian Buster/Bullseye instances we have to consider Debian Stretch which only has Python 3.5. The lowest version of Python 3 this supports is 3.6 per

cyhy-feeds/setup.py

Line 83 in d02e28e

python_requires=">=3.6",

This PR can hopefully be merged this week as I finalize testing and prepare to deploy Debian Buster/Bullseye instances.

Now that Debian Stretch is dead as Dillinger, does this change anything?

mcdonnnj · 2023-04-26T17:57:41Z

@jsf9k Until we're deploying Debian Buster/Bullseye instances we have to consider Debian Stretch which only has Python 3.5. The lowest version of Python 3 this supports is 3.6 per

cyhy-feeds/setup.py

Line 83 in d02e28e

python_requires=">=3.6",

This PR can hopefully be merged this week as I finalize testing and prepare to deploy Debian Buster/Bullseye instances.

Now that Debian Stretch is dead as Dillinger, does this change anything?

No. If there is a critical problem with the Buster images I can always create a cursed Ansible role to pull from the Debian archive for package updates to fall back on Stretch. I would rather minimize any peripheral impact until I get new images built, deployed, and verified.

Warning
I realized belatedly that this PR was never included in my batch of testing. I have a branch in cisagov/ansible-role-cyhy-feeds and am troubleshooting installing this package and its dependencies under Python 3.

Pull in the current pre-commit configuration from cisagov/skeleton-python-library and update the mypy hook dependencies. This is necessary to restore a functional pre-commit configuration to the project.

This only resulted in the `black` hook adjusting a single file.

In Python 3 files are by default opened in text-mode, which suites the JSON we are outputting, and file seeking behavior is different. This change is necessary to get compatible behavior now that this project only supports Python 3.

As currently written the following warning is emitted when using the scripts: DeprecationWarning: The SafeConfigParser class has been renamed to ConfigParser in Python 3.2. This alias will be removed in future versions. Use ConfigParser directly instead. Since this project will only support Python 3.6+ going forward it makes sense to update to remove this warning.

Pull in the current version in cisagov/skeleton-python-library as that is the most comparable to the current workflow definition. This is necessary to fix testing Python 3.6.

mcdonnnj · 2023-05-09T20:24:07Z

@dav3r @jsf9k Would you mind reviewing this PR now that I've added a number of changes. I tested this branch (with my updates) in my development CyHy environment and was able to confirm that it worked without errors.

jsf9k

I can only comment on this PR, but if I could I would request a few minor changes.

.github/workflows/build.yml

setup.py

dav3r

Aside from what @jsf9k noted, everything else looks fantastic to me.

@jsf9k Reminder that you (or any of us) still need to update the branch protection to remove the outdated checks.

Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

Update the package's classifiers to align with both the testing being done and the current defaults in cisagov/skeleton-python-library.

jsf9k

I can only comment on this PR, but I would approve it with gusto if I could!

jsf9k · 2023-05-12T19:07:13Z

🥳

jsf9k added bug This issue or pull request addresses broken functionality improvement This issue or pull request will add new or improve existing functionality labels Jun 15, 2022

jsf9k self-assigned this Jun 15, 2022

jsf9k force-pushed the improvement/insist-on-python3 branch from 7f95b78 to 0e0aaed Compare June 15, 2022 20:30

jsf9k mentioned this pull request Jun 16, 2022

Update supported platforms cisagov/ansible-role-cyhy-feeds#9

Merged

8 tasks

jsf9k marked this pull request as ready for review September 9, 2022 15:06

jsf9k requested review from dav3r, felddy and mcdonnnj as code owners September 9, 2022 15:06

dav3r added this to the Summer CyHy AMI Spectacular milestone Sep 20, 2022

dav3r mentioned this pull request Sep 23, 2022

Include period_start in request doc output #44

Merged

8 tasks

jsf9k added 5 commits September 29, 2022 17:16

Use Python 3

802d740

This code appears to work with either Python 2 or Python 3, so it makes sense to insist on Python 3 now that Python 2 is EOL.

Bump version from 0.0.4 to 0.0.5

84d79a3

Bump version from 0.0.5 to 0.0.5-rc.1

46d8fdb

Remove workflow support for Python 2

c48aa07

Update README to drop all mention of Python 2

14cbeb9

jsf9k force-pushed the improvement/insist-on-python3 branch from 0e0aaed to 14cbeb9 Compare September 29, 2022 21:16

mcdonnnj added 4 commits September 30, 2022 11:01

Update setup.py

13472bf

Realign setup.py with the version used in cisagov/skeleton-python-library now that we no longer need to support Python 2.

Adjust import of SafeConfigParser

dfb9cde

We no longer need to adjust the import depending on which major Python version is being used.

Update versions in scripts

b809c57

Until this project is converted into a proper Python package this is how it needs to be updated to reflect the package version.

Standardize GitHub Actions workflow

d02e28e

Make sure the `build.yml` workflow in this project mirrors the one in cisagov/skeleton-python-library now that we no longer need to support Python 2.

dav3r mentioned this pull request Nov 7, 2022

Capture past 26 hours of data instead of 24 in cyhy-data-extract.py #45

Merged

6 tasks

jsf9k requested review from jasonodoom and a team March 24, 2023 19:32

jsf9k assigned mcdonnnj Mar 24, 2023

jasonodoom approved these changes May 3, 2023

View reviewed changes

mcdonnnj added 5 commits May 5, 2023 19:34

Update the pre-commit configuration

e1f07bf

Pull in the current pre-commit configuration from cisagov/skeleton-python-library and update the mypy hook dependencies. This is necessary to restore a functional pre-commit configuration to the project.

Update the project after using the new pre-commit configuration

d0d06d3

This only resulted in the `black` hook adjusting a single file.

Update the build workflow for GitHub Actions

0ea5ebb

Pull in the current version in cisagov/skeleton-python-library as that is the most comparable to the current workflow definition. This is necessary to fix testing Python 3.6.

jsf9k commented May 9, 2023

View reviewed changes

.github/workflows/build.yml Show resolved Hide resolved

setup.py Outdated Show resolved Hide resolved

setup.py Show resolved Hide resolved

dav3r approved these changes May 9, 2023

View reviewed changes

jsf9k and others added 2 commits May 9, 2023 23:18

Replace boilerplate URLs with the correct ones

ab7c1c6

Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

Update package classifiers

6319537

Update the package's classifiers to align with both the testing being done and the current defaults in cisagov/skeleton-python-library.

jsf9k commented May 10, 2023

View reviewed changes

mcdonnnj merged commit 0d51f63 into develop May 12, 2023
49 checks passed

mcdonnnj deleted the improvement/insist-on-python3 branch May 12, 2023 19:03

mcdonnnj mentioned this pull request May 12, 2023

Install cisagov/cyhy-feeds as a Python 3 package cisagov/ansible-role-cyhy-feeds#23

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enforce that all scripts use Python 3 rather than Python 2 #43

Enforce that all scripts use Python 3 rather than Python 2 #43

jsf9k commented Jun 15, 2022 •

edited

dav3r commented Jun 16, 2022

jsf9k commented Jul 5, 2022

jsf9k commented Apr 18, 2023

mcdonnnj commented Apr 18, 2023 •

edited

jsf9k commented Apr 26, 2023 •

edited

mcdonnnj commented Apr 26, 2023 •

edited

mcdonnnj commented May 9, 2023

jsf9k left a comment

dav3r left a comment •

edited

jsf9k left a comment

jsf9k commented May 12, 2023

Enforce that all scripts use Python 3 rather than Python 2 #43

Enforce that all scripts use Python 3 rather than Python 2 #43

Conversation

jsf9k commented Jun 15, 2022 • edited

🗣 Description

💭 Motivation and context

🧪 Testing

✅ Pre-approval checklist

✅ Pre-merge checklist

✅ Post-merge checklist

dav3r commented Jun 16, 2022

jsf9k commented Jul 5, 2022

jsf9k commented Apr 18, 2023

mcdonnnj commented Apr 18, 2023 • edited

jsf9k commented Apr 26, 2023 • edited

mcdonnnj commented Apr 26, 2023 • edited

mcdonnnj commented May 9, 2023

jsf9k left a comment

Choose a reason for hiding this comment

dav3r left a comment • edited

Choose a reason for hiding this comment

jsf9k left a comment

Choose a reason for hiding this comment

jsf9k commented May 12, 2023

jsf9k commented Jun 15, 2022 •

edited

mcdonnnj commented Apr 18, 2023 •

edited

jsf9k commented Apr 26, 2023 •

edited

mcdonnnj commented Apr 26, 2023 •

edited

dav3r left a comment •

edited