Upgrade python versions (#383)

* Upgrade python versions

* node 16

* prettier upgrade

* openssl-legacy-provider

* simplify healthcheck for now

* oops

Author: peterbe

.github/workflows/ci.yml

@@ -11,9 +11,9 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v2.4.0
+        uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: '18'
 
       - name: Cache node_modules
         uses: actions/cache@v2.1.6
@@ -48,7 +48,6 @@ jobs:
 
       - name: Run lints
         run: |
-          pip install -r dev-requirements.txt --progress-bar off
           black --check app.py
           flake8 app.py
           yarn prettier:check

app.py

@@ -401,14 +401,15 @@ def get(self):
         # Can't really test anything because it might empty on first ever load.
         Shortlink.query.count()
 
-        # If you attempt to include Authorization headers, even on an endpoint
-        # that doesn't need it, it will 401 if the auth token is wrong.
-        response = requests.get(
-            "https://api.github.com/",
-            headers=GITHUB_REQUEST_HEADERS,
-            timeout=GITHUB_REQUEST_TIMEOUT,
-        )
-        response.raise_for_status()
+        # Commented out for now because it's doing this healthcheck too often.
+        # # If you attempt to include Authorization headers, even on an endpoint
+        # # that doesn't need it, it will 401 if the auth token is wrong.
+        # response = requests.get(
+        #     "https://api.github.com/",
+        #     headers=GITHUB_REQUEST_HEADERS,
+        #     timeout=GITHUB_REQUEST_TIMEOUT,
+        # )
+        # response.raise_for_status()
         return "OK\n"
 
 

bin/build.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-find . | grep --color=never '\~$' | xargs rm -f
+fd -t f -I -H '\~$' | xargs rm -f
 
 INLINE_RUNTIME_CHUNK=false yarn run build
 

dev-requirements.txt

@@ -15,26 +15,14 @@
     "reactstrap": "8.10.0"
   },
   "devDependencies": {
-    "prettier": "2.4.1",
-    "source-map-explorer": "2.5.2"
-  },
-  "resolutions": {
-    "braces": ">=2.3.1",
-    "handlebars": ">=4.5.3",
-    "js-yaml": ">=3.13.0",
-    "lodash": ">=4.17.21",
-    "mixin-deep": ">=1.3.2",
-    "set-value": ">=2.0.1",
-    "eslint-utils": ">=1.4.1",
-    "serialize-javascript": ">=2.1.1",
-    "kind-of": ">=6.0.3",
-    "acorn": ">=5.7.4",
-    "minimist": ">=1.2.3"
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "prettier": "3.0.3",
+    "source-map-explorer": "2.5.3"
   },
   "scripts": {
     "analyze": "source-map-explorer build/static/js/main.*",
-    "start": "react-scripts start",
-    "build": "react-scripts build",
+    "start": "react-scripts --openssl-legacy-provider start",
+    "build": "react-scripts --openssl-legacy-provider build",
     "test": "react-scripts test",
     "test:ci": "CI=true yarn test",
     "prettier:check": "prettier --check src",

package.json

@@ -1,7 +1,12 @@
 Flask==2.0.1
-psycopg2-binary==2.9.1
+psycopg2-binary==2.9.7
 Flask-SQLAlchemy==2.5.1
-requests[security]==2.26.0
-python-decouple==3.4
-python-dotenv==0.19.0
-rollbar==0.16.1
+cryptography==3.4.7
+requests==2.26.0
+python-decouple==3.8
+python-dotenv==1.0.0
+rollbar==0.16.3
+
+black==23.9.1
+flake8==6.1.0
+pip-tools==7.3.0

requirements.in

@@ -24,7 +24,7 @@ class Footer extends React.Component {
     if (document.querySelector('#_version')) {
       versionData = Object.assign(
         {},
-        document.querySelector('#_version').dataset
+        document.querySelector('#_version').dataset,
       );
     }
 

requirements.txt

@@ -15,7 +15,7 @@ const BORS_LOGIN = 'bors[bot]';
 
 function makeTagAbsoluteUrl(owner, repo, tag) {
   return `https://github.com/${owner}/${repo}/releases/tag/${encodeURIComponent(
-    tag
+    tag,
   )}`;
 }
 
@@ -206,7 +206,7 @@ export default withRouter(DeployPage);
 class DeployTable extends React.Component {
   static propTypes = {
     deployInfo: PropTypes.arrayOf(
-      PropTypes.shape({ name: PropTypes.string.isRequired })
+      PropTypes.shape({ name: PropTypes.string.isRequired }),
     ).isRequired,
     commits: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
     tags: PropTypes.object.isRequired,
@@ -230,7 +230,7 @@ class DeployTable extends React.Component {
 
   _restoreBorsModeChoice = () => {
     const prefs = JSON.parse(
-      localStorage.getItem(this.prefBorsModeCacheKey) || '{}'
+      localStorage.getItem(this.prefBorsModeCacheKey) || '{}',
     );
     if (
       this.props.code in prefs &&
@@ -242,7 +242,7 @@ class DeployTable extends React.Component {
 
   _persistBorsModeChoice = () => {
     const prefs = JSON.parse(
-      localStorage.getItem(this.prefBorsModeCacheKey) || '{}'
+      localStorage.getItem(this.prefBorsModeCacheKey) || '{}',
     );
     prefs[this.props.code] = this.state.borsMode;
     localStorage.setItem(this.prefBorsModeCacheKey, JSON.stringify(prefs));
@@ -307,7 +307,7 @@ class DeployTable extends React.Component {
               key={`${commit.sha}:${deploy.name}`}
             />
           ))}
-        </tr>
+        </tr>,
       );
 
       if (foundMatch) {
@@ -502,7 +502,7 @@ function UserAvatars({ users }) {
 class RepoSummary extends React.Component {
   static propTypes = {
     deployInfo: PropTypes.arrayOf(
-      PropTypes.shape({ name: PropTypes.string.isRequired })
+      PropTypes.shape({ name: PropTypes.string.isRequired }),
     ).isRequired,
     owner: PropTypes.string.isRequired,
     repo: PropTypes.string.isRequired,

src/App.js

@@ -17,7 +17,7 @@ class LongUrlRedirect extends React.Component {
       PropTypes.shape({
         url: PropTypes.string.isRequired,
         name: PropTypes.string.isRequired,
-      })
+      }),
     ),
   };