Skip to content

Commit

Permalink
Support Python 3.10 (cartography-cncf#1285)
Browse files Browse the repository at this point in the history
  • Loading branch information
achantavy authored and tmsteere committed Aug 8, 2024
1 parent 3bbcca4 commit 3cf98d2
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/issue-report-feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ would be used.
*Please complete the following information:*:
> - Cartography release version or commit hash [e.g. 0.12.0 or 95e8e11913e2a44a4d4682506d8364a638ceac69]
> - Python version: [e.g. 3.7.4]
> - Python version: [e.g. 3.10.0]
> - OS (feel free to omit this if you don't think it's relevant to your issue): [e.g. Ubuntu bla bla, OSX bla bla]

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v1
with:
python-version: 3.8
python-version: 3.10
- name: Install pypa/build
run: >-
python -m
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sphinx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install Python
uses: actions/setup-python@v2
with:
python-version: 3.9
python-version: 3.10
# https://docs.github.com/en/actions/guides/building-and-testing-python#caching-dependencies
# ^-- How to set up caching for pip on Ubuntu
- name: Cache pip
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- uses: pre-commit/[email protected]
with:
extra_args: --all-files --show-diff-on-failure
Expand All @@ -38,7 +38,7 @@ jobs:
neo4j:4.4-community
- uses: actions/setup-python@v2
with:
python-version: "3.8"
python-version: "3.10"
# Cache our pip dir for efficiency; see https://medium.com/ai2-blog/python-caching-in-github-actions-e9452698e98d.
- uses: actions/cache@v2
with:
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
neo4j:5
- uses: actions/setup-python@v2
with:
python-version: "3.8"
python-version: "3.10"
# Cache our pip dir for efficiency; see https://medium.com/ai2-blog/python-caching-in-github-actions-e9452698e98d.
- uses: actions/cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*

# Installs pip supported by python3.8
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3.8 get-pip.py
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3.10 get-pip.py

# Create cartography user so that we can give it ownership of the directory later for unit&integ tests
RUN groupadd cartography && \
Expand Down
2 changes: 1 addition & 1 deletion dist.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9-slim@sha256:85c7a2a383a01e0b77b5f9c97d8b1eef70409a99552fde03c518a98dfa19609c
FROM python:3.10-slim

# the UID and GID to run cartography as
# (https://github.com/hexops/dockerfile#do-not-use-a-uid-below-10000).
Expand Down
2 changes: 1 addition & 1 deletion docs/root/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.. _cartography-installation:

Time to set up the server that will run Cartography. Cartography _should_ work on both Linux and Windows servers, but bear in mind we've only tested it in Linux so far. Cartography supports Python 3.8. Older versions of Python may work but are not explicitly supported.
Time to set up the server that will run Cartography. Cartography _should_ work on both Linux and Windows servers, but bear in mind we've only tested it in Linux so far. Cartography supports Python 3.10. Older versions of Python may work but are not explicitly supported.

1. **Run the Neo4j graph database version 4.x** on your server.

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from setuptools import find_packages
from setuptools import setup

__version__ = '0.89.0'
__version__ = '0.90.0rc1'


setup(
Expand Down Expand Up @@ -83,7 +83,7 @@
'Natural Language :: English',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.10',
'Topic :: Security',
'Topic :: Software Development :: Libraries',
'Topic :: Software Development :: Libraries :: Python Modules',
Expand Down

0 comments on commit 3cf98d2

Please sign in to comment.