Remove F36 references

.gitlab-ci.yml

@@ -67,12 +67,6 @@ make-image-arch:
  extends: make-image-deb
  script:
    - make image-arch branch=$CI_COMMIT_REF_SLUG src=archlinux || true
-
-make-image-fed36:
- stage: image
- extends: make-image-deb
- script:
-   - make image-fed36 branch=$CI_COMMIT_REF_SLUG src=fedora36
    
 make-image-fed37:
  stage: image
@@ -99,12 +93,6 @@ test-arch:
  image: $CI_REGISTRY_IMAGE/archlinux:branch-$CI_COMMIT_REF_SLUG
  allow_failure: true
 
-test-fed36:
- extends: test-deb
- needs:
-   - job: make-image-fed36
- image: $CI_REGISTRY_IMAGE/fedora36:branch-$CI_COMMIT_REF_SLUG
- 
 test-fed37:
  extends: test-deb
  needs:
@@ -117,7 +105,6 @@ release-publish-github:
  stage: release
  needs:
    - job: build-deb
-   - job: build-fed36
    - job: build-fed37
  when: manual
  variables:
@@ -130,7 +117,6 @@ release-publish-github-tags:
  stage: release
  needs:
    - job: build-deb
-   - job: build-fed36
    - job: build-fed37
  when: manual
  variables:

Dockerfile.fed36

@@ -1,46 +0,0 @@
-FROM IMAGE_URL_FED36
-RUN dnf update -y
-
-# RUN yum -y install epel-release && yum repolist
-
-RUN dnf install -y \
-    gcc \
-    sudo \
-    rpm-build \
-    rpm-devel \
-    rpmlint \
-    make \
-    python3 \
-    python3-pip \
-    bash \
-    coreutils \
-    diffutils \
-    patch \
-    rpmdevtools \
-    rpm-sign \
-    vim \
-    openssl-devel \
-    openssl-libs
-
-RUN dnf install -y \
-    python3-requests \
-    python3-pyOpenSSL \
-    python3-bcrypt \
-    python3-gnupg
-
-RUN dnf install -y \
-    python3-pytest \
-    python3-pytest-cov
-
-RUN useradd -ms /bin/bash user
-RUN usermod -a -G wheel user
-RUN echo '%wheel ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-COPY docker_entry.sh /usr/local/bin
-COPY . /home/user/proton-python-client
-
-RUN chown -R user:user /home/user/
-USER user
-WORKDIR /home/user/proton-python-client
-
-ENTRYPOINT ["/usr/local/bin/docker_entry.sh"]

Makefile

@@ -13,11 +13,10 @@ ifeq ($(branch), latest)
 endif
 
 IMAGE_URL_DEB = ubuntu:latest
-IMAGE_URL_FED36 = fedora:36
 IMAGE_URL_FED37 = fedora:37
 IMAGE_URL_ARCH = archlinux:base
 
-base: image-deb image-fed36image-fed37  image-arch
+base: image-deb image-fed37  image-arch
 
 # Create the image based on ubuntu
 image-deb: image
@@ -34,11 +33,6 @@ image-fed37: image
 image-fed37: DOCKER_FILE_SOURCE = Dockerfile.fed37
 image-fed37: src = fedora37
 
-# Create the image based on fedora 36
-image-fed36: image
-image-fed36: DOCKER_FILE_SOURCE = Dockerfile.fed36
-image-fed36: src = fedora36
-
 ## Make remote image form a branch make image branch=<branchName> (master default)
 image: requirements.txt docker-source
 	docker build -t $(NAME_IMAGE):$(TAG_IMAGE) -f "$(DOCKERFILE_BUILD)" .
@@ -47,7 +41,7 @@ image: requirements.txt docker-source
 
 ## We host our own copy of the image ubuntu:latest
 docker-source:
-	sed "s|IMAGE_URL_FED36|$(IMAGE_URL_FED36)|; s|IMAGE_URL_FED37|$(IMAGE_URL_FED37)|; s|IMAGE_URL_DEB|$(IMAGE_URL_DEB)|; s|IMAGE_URL_ARCH|$(IMAGE_URL_ARCH)|" $(DOCKER_FILE_SOURCE) > /tmp/Dockerfile.image
+	sed "s|IMAGE_URL_FED37|$(IMAGE_URL_FED37)|; s|IMAGE_URL_DEB|$(IMAGE_URL_DEB)|; s|IMAGE_URL_ARCH|$(IMAGE_URL_ARCH)|" $(DOCKER_FILE_SOURCE) > /tmp/Dockerfile.image
 
 requirements.txt:
 	@ touch requirements.txt
@@ -65,7 +59,7 @@ local: docker-source
 	@ rm -rf __SOURCE_APP || true
 local: NAME_IMAGE = proton-python-client:latest
 
-local-base: local-deb local-fed36 local-fed37 local-arch
+local-base: local-deb local-fed37 local-arch
 
 local-deb: local
 local-deb: DOCKER_FILE_SOURCE = Dockerfile.deb
@@ -73,9 +67,6 @@ local-deb: DOCKER_FILE_SOURCE = Dockerfile.deb
 local-fed37: local
 local-fed37: DOCKER_FILE_SOURCE = Dockerfile.fed37
 
-local-fed36: local
-local-fed36: DOCKER_FILE_SOURCE = Dockerfile.fed36
-
 local-arch: local
 local-arch: DOCKER_FILE_SOURCE = Dockerfile.arch
 
@@ -110,16 +101,6 @@ test-fed37: local-fed37
 			--volume $(PWD)/.env:/home/user/proton-python-client.env \
 			proton-python-client:latest \
 			python3 -m pytest
-
-test-fed36: local-fed36
-	# Keep -it because with colors it's better
-	@ docker run \
-			--rm \
-			-it \
-			--privileged \
-			--volume $(PWD)/.env:/home/user/proton-python-client.env \
-			proton-python-client:latest \
-			python3 -m pytest
 			
 ## Run tests against the latest version of the image from your code
 test-arch: local-arch

Pipfile

@@ -1,14 +0,0 @@
-[[source]]
-name = "pypi"
-url = "https://pypi.org/simple"
-verify_ssl = true
-
-[dev-packages]
-pytest = "*"
-flake8 = "*"
-
-[packages]
-requests = ">=2.18.4"
-bcrypt = ">=3.1.4"
-python-gnupg = ">=0.4.1"
-pyopenssl = ">=17.5"