Skip to content

Commit 17754a8

Browse files
author
medeor413
authored
Merge pull request #150 from evonzee/feature/python-3.11
Update to Python 3.11
2 parents 9291e5a + e3fd7fa commit 17754a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+751
-678
lines changed

.dockerignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
.dockerignore
2-
Dockerfile
2+
Dockerfile
3+
.venv
4+
.github
5+
config/*.json
6+
config/*.log
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: ci
2+
3+
on:
4+
push:
5+
branches:
6+
- "**"
7+
tags:
8+
- "v*.*.*"
9+
10+
jobs:
11+
docker:
12+
runs-on: ubuntu-latest
13+
steps:
14+
-
15+
name: Checkout
16+
uses: actions/checkout@v3
17+
-
18+
name: Docker meta
19+
id: meta
20+
uses: docker/metadata-action@v4
21+
with:
22+
# list of Docker images to use as base name for tags
23+
images: |
24+
${{ secrets.DOCKERHUB_IMAGE }}
25+
# generate Docker tags based on the following events/attributes
26+
tags: |
27+
type=ref,event=branch
28+
type=semver,pattern={{version}}
29+
type=semver,pattern={{major}}.{{minor}}
30+
type=semver,pattern={{major}}
31+
-
32+
name: Set up QEMU
33+
uses: docker/setup-qemu-action@v2
34+
-
35+
name: Set up Docker Buildx
36+
uses: docker/setup-buildx-action@v2
37+
-
38+
name: Login to Docker Hub
39+
if: github.event_name != 'pull_request'
40+
uses: docker/login-action@v2
41+
with:
42+
username: ${{ secrets.DOCKERHUB_USERNAME }}
43+
password: ${{ secrets.DOCKERHUB_TOKEN }}
44+
-
45+
name: Build and push
46+
uses: docker/build-push-action@v4
47+
with:
48+
context: .
49+
push: ${{ github.event_name != 'pull_request' }}
50+
tags: ${{ steps.meta.outputs.tags }}
51+
labels: ${{ steps.meta.outputs.labels }}

.gitignore

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ nosetests.xml
4141
/config/player.bak
4242
/config/player.dir
4343
/config/player
44-
/config/config.json
45-
/config/permissions.json
44+
/config/*.json
4645
*config.json
4746
*.db
4847
*.db-journal
@@ -56,3 +55,10 @@ nosetests.xml
5655

5756
# Cleanup after Macs
5857
.DS_Store
58+
59+
#python virtualenv
60+
virtualenv
61+
.venv
62+
63+
# dev container
64+
.devcontainer

Dockerfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
FROM python:3.5-stretch
1+
FROM python:3.11-bookworm
2+
WORKDIR /app
23

3-
RUN pip install discord irc3
4+
COPY requirements.txt .
5+
RUN pip install -r requirements.txt
46

5-
RUN mkdir /app /app/defaults
6-
COPY . /app/
7+
COPY . .
8+
RUN mkdir /app/defaults
79
COPY config/*.default /app/defaults/
8-
WORKDIR /app
10+
911
COPY config/permissions.json.default config/permissions.json
1012

1113
VOLUME /app/config

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
## About
44
StarryPy3k is the successor to StarryPy. StarryPy is a plugin-driven Starbound
55
server wrapper that adds a great deal of functionality to Starbound. StarryPy3k
6-
is written using asyncio is Python 3.
6+
is written using asyncio in Python 3.11.
77

88
***Please note this is still in very active development and is not ready to be
99
used on general purpose servers. It should mostly work, but you have been
1010
forewarned.***
1111

1212
## Requirements
13-
Python **3.4.4** or greater is required. Test are only conducted on Python
14-
versions 3.4 and 3.5.
13+
Due to an upgrade of the Discord API, Python **3.8** or greater is required.
14+
Tests are only conducted on Python version 3.11.
1515

16-
While StarryPy3k **may** work with earlier version of Python, it is not
16+
While StarryPy3k **may** work with earlier or later versions of Python, it is not
1717
recommended and will not be readily supported.
1818

1919
## Installation
@@ -230,4 +230,4 @@ learning the ropes of StarryPy, decided to take the reigns on StarryPy3k.
230230
After many months of staring at the code (and many emails to
231231
CarrotsAreMediocre requesting assistance in understanding just what it is
232232
doing), is feeling a modicum more confident in handling this project and
233-
keeping it running.
233+
keeping it running.

VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v1.4.3

0 commit comments

Comments
 (0)